Use the correct Aspect in AspectFunction for Skylark aspects.

Previously AspectFunction was using an Aspect from the SkyKey, which
might have been stale.

This CL fixes the bug as uncovered in the test (see SkylarkAspectsTest),
but further refactoring is needed since SkylarkAspectClass equals() is
incorrect, and in fact obtaining the Skylark aspect definition should
always introduce Skyframe dependency.

--
MOS_MIGRATED_REVID=119137636
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 400aba7..c390a81499 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
@@ -31,6 +31,7 @@
 import com.google.devtools.build.lib.collect.nestedset.Order;
 import com.google.devtools.build.lib.events.Event;
 import com.google.devtools.build.lib.events.StoredEventHandler;
+import com.google.devtools.build.lib.packages.Aspect;
 import com.google.devtools.build.lib.packages.Attribute;
 import com.google.devtools.build.lib.packages.BuildFileContainsErrorsException;
 import com.google.devtools.build.lib.packages.NativeAspectClass;
@@ -110,9 +111,12 @@
     NestedSetBuilder<Label> transitiveRootCauses = NestedSetBuilder.stableOrder();
     AspectKey key = (AspectKey) skyKey.argument();
     ConfiguredAspectFactory aspectFactory;
+    Aspect aspect;
     if (key.getAspectClass() instanceof NativeAspectClass<?>) {
+      NativeAspectClass<?> nativeAspectClass = (NativeAspectClass<?>) key.getAspectClass();
       aspectFactory =
-          (ConfiguredAspectFactory) ((NativeAspectClass<?>) key.getAspectClass()).newInstance();
+          (ConfiguredAspectFactory) nativeAspectClass.newInstance();
+      aspect = new Aspect(nativeAspectClass, key.getParameters());
     } else if (key.getAspectClass() instanceof SkylarkAspectClass) {
       SkylarkAspectClass skylarkAspectClass = (SkylarkAspectClass) key.getAspectClass();
       SkylarkAspect skylarkAspect;
@@ -128,6 +132,7 @@
       }
 
       aspectFactory = new SkylarkAspectFactory(skylarkAspect.getName(), skylarkAspect);
+      aspect = new Aspect(skylarkAspect.getAspectClass(), key.getParameters());
     } else {
       throw new IllegalStateException();
     }
@@ -202,7 +207,7 @@
               env,
               resolver,
               originalTargetAndAspectConfiguration,
-              key.getAspect(),
+              aspect,
               configConditions,
               ruleClassProvider,
               view.getHostConfiguration(originalTargetAndAspectConfiguration.getConfiguration()),
@@ -219,6 +224,7 @@
       return createAspect(
           env,
           key,
+          aspect,
           aspectFactory,
           associatedTarget,
           key.getAspectConfiguration(),
@@ -245,6 +251,7 @@
   private AspectValue createAspect(
       Environment env,
       AspectKey key,
+      Aspect aspect,
       ConfiguredAspectFactory aspectFactory,
       RuleConfiguredTarget associatedTarget,
       BuildConfiguration aspectConfiguration,
@@ -267,7 +274,7 @@
             analysisEnvironment,
             associatedTarget,
             aspectFactory,
-            key.getAspect(),
+            aspect,
             directDeps,
             configConditions,
             aspectConfiguration,
@@ -291,6 +298,7 @@
 
     return new AspectValue(
         key,
+        aspect,
         associatedTarget.getLabel(),
         associatedTarget.getTarget().getLocation(),
         configuredAspect,