commit 7184b6f55a8cb72094a481d056fe89bc7be80c76
author Googler <noreply@google.com> Tue May 16 05:25:49 2017 +0200
committer Dmitry Lomov <dslomov@google.com> Tue May 16 15:24:46 2017 +0200
tree 1378cc258d8874356baac702c2b5960d90178588
parent 23004957a56d304106d5dbf0d6ea52ec10713b39

Have TransitiveTraversalValues store kind of targets which have errors when computing TransitiveTraversalValues.

RELNOTES: None
PiperOrigin-RevId: 156138657

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

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTraversalFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTraversalFunction.java
index 4f11095..7673069 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTraversalFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTraversalFunction.java
@@ -81,8 +81,13 @@
     }
   }
 
-  protected Collection<Label> getAspectLabels(Rule fromRule, Attribute attr, Label toLabel,
-      ValueOrException2<NoSuchPackageException, NoSuchTargetException> toVal, Environment env) {
+  @Override
+  protected Collection<Label> getAspectLabels(
+      Rule fromRule,
+      Attribute attr,
+      Label toLabel,
+      ValueOrException2<NoSuchPackageException, NoSuchTargetException> toVal,
+      Environment env) {
     try {
       if (toVal == null) {
         return ImmutableList.of();
@@ -110,7 +115,8 @@
     String firstErrorMessage = accumulator.getFirstErrorMessage();
     return targetLoadedSuccessfully
         ? TransitiveTraversalValue.forTarget(targetAndErrorIfAny.getTarget(), firstErrorMessage)
-        : TransitiveTraversalValue.unsuccessfulTransitiveTraversal(firstErrorMessage);
+        : TransitiveTraversalValue.unsuccessfulTransitiveTraversal(
+            firstErrorMessage, targetAndErrorIfAny.getTarget());
   }
 
   @Override