Skip to content

Commit 649521a

Browse files
Googlercopybara-github
Googler
authored andcommitted
Add method to SkyframeExecutor which returns top-level analysis phase keys.
PiperOrigin-RevId: 444878162
1 parent a48e246 commit 649521a

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

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

+10-1
Original file line numberDiff line numberDiff line change
@@ -2244,11 +2244,20 @@ EvaluationResult<ActionLookupValue> configureTargets(
22442244
.build();
22452245
EvaluationResult<ActionLookupValue> result =
22462246
memoizingEvaluator.evaluate(
2247-
Iterables.concat(configuredTargetKeys, topLevelAspectKeys), evaluationContext);
2247+
analysisPhaseKeys(configuredTargetKeys, topLevelAspectKeys), evaluationContext);
22482248
perCommandSyscallCache.noteAnalysisPhaseEnded();
22492249
return result;
22502250
}
22512251

2252+
/**
2253+
* Returns top-level analysis phase keys, {@link ConfiguredTargetKey} and {@link
2254+
* TopLevelAspectsKey}.
2255+
*/
2256+
protected Iterable<? extends SkyKey> analysisPhaseKeys(
2257+
Iterable<ConfiguredTargetKey> ctKeys, Iterable<TopLevelAspectsKey> aspectKeys) {
2258+
return Iterables.concat(ctKeys, aspectKeys);
2259+
}
2260+
22522261
/**
22532262
* Evaluates the given collections of CT/Aspect BuildDriverKeys. This is part of
22542263
* https://github.com/bazelbuild/bazel/issues/14057, internal: b/147350683.

0 commit comments

Comments
 (0)