diff options
Diffstat (limited to 'src/main/java/com/google/devtools')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/TransitiveBaseTraversalFunction.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveBaseTraversalFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveBaseTraversalFunction.java index 5b6e9ed59b..b51bab41d5 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveBaseTraversalFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/TransitiveBaseTraversalFunction.java @@ -125,7 +125,6 @@ abstract class TransitiveBaseTraversalFunction<TProcessedTargets> implements Sky loadTargetResultsType.equals(LoadTargetResultsType.TARGET_AND_ERROR_IF_ANY), loadTargetResultsType); TargetAndErrorIfAny targetAndErrorIfAny = (TargetAndErrorIfAny) loadTargetResults; - TProcessedTargets processedTargets = processTarget(label, targetAndErrorIfAny); // Process deps from attributes. Collection<SkyKey> labelDepKeys = @@ -134,22 +133,23 @@ abstract class TransitiveBaseTraversalFunction<TProcessedTargets> implements Sky Map<SkyKey, ValueOrException2<NoSuchPackageException, NoSuchTargetException>> depMap = env.getValuesOrThrow(labelDepKeys, NoSuchPackageException.class, NoSuchTargetException.class); - processDeps(processedTargets, env.getListener(), targetAndErrorIfAny, depMap.entrySet()); if (env.valuesMissing()) { return null; } - // Process deps from aspects. Iterable<SkyKey> labelAspectKeys = getStrictLabelAspectKeys(targetAndErrorIfAny.getTarget(), depMap, env); Set<Entry<SkyKey, ValueOrException2<NoSuchPackageException, NoSuchTargetException>>> labelAspectEntries = env.getValuesOrThrow(labelAspectKeys, NoSuchPackageException.class, NoSuchTargetException.class).entrySet(); - processDeps(processedTargets, env.getListener(), targetAndErrorIfAny, labelAspectEntries); if (env.valuesMissing()) { return null; } + TProcessedTargets processedTargets = processTarget(label, targetAndErrorIfAny); + processDeps(processedTargets, env.getListener(), targetAndErrorIfAny, depMap.entrySet()); + processDeps(processedTargets, env.getListener(), targetAndErrorIfAny, labelAspectEntries); + return computeSkyValue(targetAndErrorIfAny, processedTargets); } |