Stop storing the base configuration in AspectKey. As with https://github.com/bazelbuild/bazel/commit/3863b536bcab8de2000f342c85c31c7ea91cccbe, we don't want to have to serialize/deserialize a BuildConfiguration in a SkyKey.

Cutting the edge to the aspect configuration will come in a follow-up.

PiperOrigin-RevId: 183117915

1 files changed, 3 insertions, 3 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
index 630830dfd1..a50a9c4a02 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
@@ -224,9 +224,9 @@ public final class AspectFunction implements SkyFunction {
     ConfiguredTargetValue configuredTargetValue;
     try {
       configuredTargetValue =
-          (ConfiguredTargetValue) env.getValueOrThrow(
-              ConfiguredTargetValue.key(key.getLabel(), key.getBaseConfiguration()),
-              ConfiguredValueCreationException.class);
+          (ConfiguredTargetValue)
+              env.getValueOrThrow(
+                  key.getConfiguredTargetKey(), ConfiguredValueCreationException.class);
     } catch (ConfiguredValueCreationException e) {
       throw new AspectFunctionException(new AspectCreationException(e.getRootCauses()));
     }