commit 8cd101df72313049a13863763c8cd92c06f0320d
author janakr <janakr@google.com> Mon Nov 16 13:12:58 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Mon Nov 16 13:17:51 2020 -0800
tree 4c14b9443919253ee281dc82d29629815e73f87d
parent 4aeb7b320857b5925920308ecacf4e9c431a6616

Remove TransitiveTargetValue#transitiveRootCauses: callers only need to know if there was an error, not the full list, after unknown commit.

PiperOrigin-RevId: 342704215

src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTargetFunction.java

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTargetFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTargetFunction.java
index efa95de..8b393e5 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTargetFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTargetFunction.java
@@ -67,10 +67,10 @@
   }
 
   @Override
-  TransitiveTargetValueBuilder processTarget(Label label, TargetAndErrorIfAny targetAndErrorIfAny) {
+  TransitiveTargetValueBuilder processTarget(TargetAndErrorIfAny targetAndErrorIfAny) {
     Target target = targetAndErrorIfAny.getTarget();
     boolean packageLoadedSuccessfully = targetAndErrorIfAny.isPackageLoadedSuccessfully();
-    return new TransitiveTargetValueBuilder(label, target, packageLoadedSuccessfully);
+    return new TransitiveTargetValueBuilder(target, packageLoadedSuccessfully);
   }
 
   @Override
@@ -82,7 +82,6 @@
           depEntries) {
     boolean successfulTransitiveLoading = builder.isSuccessfulTransitiveLoading();
     Target target = targetAndErrorIfAny.getTarget();
-    NestedSetBuilder<Label> transitiveRootCauses = builder.getTransitiveRootCauses();
 
     for (Map.Entry<SkyKey, ValueOrException2<NoSuchPackageException, NoSuchTargetException>> entry :
         depEntries) {
@@ -95,15 +94,12 @@
         }
       } catch (NoSuchPackageException | NoSuchTargetException e) {
         successfulTransitiveLoading = false;
-        transitiveRootCauses.add(depLabel);
         maybeReportErrorAboutMissingEdge(target, depLabel, e, eventHandler);
         continue;
       }
       builder.getTransitiveTargets().addTransitive(transitiveTargetValue.getTransitiveTargets());
-      NestedSet<Label> rootCauses = transitiveTargetValue.getTransitiveRootCauses();
-      if (rootCauses != null) {
+      if (transitiveTargetValue.encounteredLoadingError()) {
         successfulTransitiveLoading = false;
-        transitiveRootCauses.addTransitive(rootCauses);
         if (transitiveTargetValue.getErrorLoadingTarget() != null) {
           maybeReportErrorAboutMissingEdge(target, depLabel,
               transitiveTargetValue.getErrorLoadingTarget(), eventHandler);
@@ -281,20 +277,14 @@
     private final NestedSetBuilder<Label> transitiveTargets;
     private final NestedSetBuilder<Class<? extends Fragment>> transitiveConfigFragments;
     private final Set<Class<? extends Fragment>> configFragmentsFromDeps;
-    private final NestedSetBuilder<Label> transitiveRootCauses;
 
-    public TransitiveTargetValueBuilder(Label label, Target target,
-        boolean packageLoadedSuccessfully) {
+    public TransitiveTargetValueBuilder(Target target, boolean packageLoadedSuccessfully) {
       this.transitiveTargets = NestedSetBuilder.stableOrder();
       this.transitiveConfigFragments = NestedSetBuilder.stableOrder();
       // No need to store directly required fragments that are also required by deps.
       this.configFragmentsFromDeps = new LinkedHashSet<>();
-      this.transitiveRootCauses = NestedSetBuilder.stableOrder();
 
       this.successfulTransitiveLoading = packageLoadedSuccessfully;
-      if (!packageLoadedSuccessfully) {
-        transitiveRootCauses.add(label);
-      }
       transitiveTargets.add(target.getLabel());
     }
 
@@ -310,10 +300,6 @@
       return configFragmentsFromDeps;
     }
 
-    public NestedSetBuilder<Label> getTransitiveRootCauses() {
-      return transitiveRootCauses;
-    }
-
     public boolean isSuccessfulTransitiveLoading() {
       return successfulTransitiveLoading;
     }
@@ -329,7 +315,6 @@
           ? TransitiveTargetValue.successfulTransitiveLoading(loadedTargets, configFragments)
           : TransitiveTargetValue.unsuccessfulTransitiveLoading(
               loadedTargets,
-              transitiveRootCauses.build(),
               errorLoadingTarget,
               configFragments);
     }