diff options
author | Googler <noreply@google.com> | 2017-05-16 05:25:49 +0200 |
---|---|---|
committer | Dmitry Lomov <dslomov@google.com> | 2017-05-16 15:24:46 +0200 |
commit | 7184b6f55a8cb72094a481d056fe89bc7be80c76 (patch) | |
tree | 1378cc258d8874356baac702c2b5960d90178588 /src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTraversalFunction.java | |
parent | 23004957a56d304106d5dbf0d6ea52ec10713b39 (diff) |
Have TransitiveTraversalValues store kind of targets which have errors when computing TransitiveTraversalValues.
RELNOTES: None
PiperOrigin-RevId: 156138657
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTraversalFunction.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTraversalFunction.java | 12 |
1 files changed, 9 insertions, 3 deletions
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 4f11095490..76730690b8 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 @@ public class TransitiveTraversalFunction } } - 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 @@ public class TransitiveTraversalFunction String firstErrorMessage = accumulator.getFirstErrorMessage(); return targetLoadedSuccessfully ? TransitiveTraversalValue.forTarget(targetAndErrorIfAny.getTarget(), firstErrorMessage) - : TransitiveTraversalValue.unsuccessfulTransitiveTraversal(firstErrorMessage); + : TransitiveTraversalValue.unsuccessfulTransitiveTraversal( + firstErrorMessage, targetAndErrorIfAny.getTarget()); } @Override |