diff options
author | Nathan Harmata <nharmata@google.com> | 2015-09-30 22:32:49 +0000 |
---|---|---|
committer | Florian Weikert <fwe@google.com> | 2015-09-30 23:45:52 +0000 |
commit | d7a7275f3116fa8a93b80356ec683595ba2695a7 (patch) | |
tree | 9a8902617b99b74645d0150906b243cb3d01887c /src/main/java/com/google/devtools/build/lib/skyframe/TransitiveTraversalFunction.java | |
parent | 4e29c83dacbeca423fd9003c3d28a2cd24aac3fd (diff) |
Don't report errors for missing edges in TransitiveTraversalFunction.
--
MOS_MIGRATED_REVID=104342541
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 | 23 |
1 files changed, 2 insertions, 21 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 bd28a39b4c..416ef33e9b 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 @@ -35,8 +35,8 @@ import java.util.Set; /** * This class is like {@link TransitiveTargetFunction}, but the values it returns do not contain * {@link NestedSet}s. It should be used only when the side-effects of {@link - * TransitiveTargetFunction} are desired (i.e., loading transitive targets and their packages, and - * emitting error events). + * TransitiveTargetFunction} on the skyframe graph are desired (i.e., ensuring that transitive + * targets and their packages have been loaded). */ public class TransitiveTraversalFunction extends TransitiveBaseTraversalFunction<DummyAccumulator> { @@ -55,25 +55,6 @@ public class TransitiveTraversalFunction extends TransitiveBaseTraversalFunction TargetAndErrorIfAny targetAndErrorIfAny, Iterable<Entry<SkyKey, ValueOrException2<NoSuchPackageException, NoSuchTargetException>>> depEntries) { - Target target = targetAndErrorIfAny.getTarget(); - for (Entry<SkyKey, ValueOrException2<NoSuchPackageException, NoSuchTargetException>> entry : - depEntries) { - Label depLabel = (Label) entry.getKey().argument(); - TransitiveTraversalValue transitiveTraversalValue; - try { - transitiveTraversalValue = (TransitiveTraversalValue) entry.getValue().get(); - if (transitiveTraversalValue == null) { - continue; - } - } catch (NoSuchPackageException | NoSuchTargetException e) { - maybeReportErrorAboutMissingEdge(target, depLabel, e, eventHandler); - continue; - } - if (transitiveTraversalValue.getErrorLoadingTarget() != null) { - maybeReportErrorAboutMissingEdge(target, depLabel, - transitiveTraversalValue.getErrorLoadingTarget(), eventHandler); - } - } } protected Collection<Label> getAspectLabels(Target fromTarget, Attribute attr, Label toLabel, |