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, 1 insertions, 8 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ToplevelSkylarkAspectFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ToplevelSkylarkAspectFunction.java
index 82de66d23c..16d4c35290 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ToplevelSkylarkAspectFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ToplevelSkylarkAspectFunction.java
@@ -19,8 +19,6 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.events.Event;
-import com.google.devtools.build.lib.packages.AspectDescriptor;
-import com.google.devtools.build.lib.packages.AspectParameters;
 import com.google.devtools.build.lib.packages.SkylarkAspect;
 import com.google.devtools.build.lib.skyframe.AspectFunction.AspectCreationException;
 import com.google.devtools.build.lib.skyframe.AspectValue.SkylarkAspectLoadingKey;
@@ -82,12 +80,7 @@ public class ToplevelSkylarkAspectFunction implements SkyFunction {
     } catch (AspectCreationException e) {
       throw new LoadSkylarkAspectFunctionException(e);
     }
-    SkyKey aspectKey =
-        AspectValue.createAspectKey(
-            aspectLoadingKey.getTargetLabel(),
-            aspectLoadingKey.getTargetConfiguration(),
-            new AspectDescriptor(skylarkAspect.getAspectClass(), AspectParameters.EMPTY),
-            aspectLoadingKey.getAspectConfiguration());
+    SkyKey aspectKey = aspectLoadingKey.toAspectKey(skylarkAspect.getAspectClass());
 
     return env.getValue(aspectKey);
   }