aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
diff options
context:
space:
mode:
authorGravatar ulfjack <ulfjack@google.com>2017-10-30 07:05:53 -0400
committerGravatar John Cater <jcater@google.com>2017-10-30 10:41:59 -0400
commitdc73a1d67e351acea7367f7aabb1dfa61c207b01 (patch)
treeb3f5e1f817b4046d8e70bedc4d87e148056a1e8a /src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
parentc50cd13c75a2a1685f5ac9bd70561ac1e50722e7 (diff)
Move TransitiveTargetKey to a dedicated top-level class
PiperOrigin-RevId: 173873310
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
index 7145a1d23c..0a5162387a 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
@@ -1449,7 +1449,7 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory {
fragmentsMap.put(key.getLabel(), allFragments);
} else {
depsToEvaluate.add(key);
- transitiveFragmentSkyKeys.add(TransitiveTargetValue.key(key.getLabel()));
+ transitiveFragmentSkyKeys.add(TransitiveTargetKey.of(key.getLabel()));
}
}
EvaluationResult<SkyValue> fragmentsResult = evaluateSkyKeys(
@@ -1460,11 +1460,11 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory {
for (Dependency key : keys) {
if (!depsToEvaluate.contains(key)) {
// No fragments to compute here.
- } else if (fragmentsResult.getError(TransitiveTargetValue.key(key.getLabel())) != null) {
+ } else if (fragmentsResult.getError(TransitiveTargetKey.of(key.getLabel())) != null) {
labelsWithErrors.add(key.getLabel());
} else {
TransitiveTargetValue ttv =
- (TransitiveTargetValue) fragmentsResult.get(TransitiveTargetValue.key(key.getLabel()));
+ (TransitiveTargetValue) fragmentsResult.get(TransitiveTargetKey.of(key.getLabel()));
fragmentsMap.put(key.getLabel(), ttv.getTransitiveConfigFragments().toSet());
}
}
@@ -1683,7 +1683,7 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory {
throws InterruptedException {
List<SkyKey> valueNames = new ArrayList<>();
for (Label label : labelsToVisit) {
- valueNames.add(TransitiveTargetValue.key(label));
+ valueNames.add(TransitiveTargetKey.of(label));
}
return buildDriver.evaluate(valueNames, keepGoing, parallelThreads, eventHandler);
}