commit 68c0716bb289beb1ff188548990d94917549701d
author Googler <noreply@google.com> Mon Jan 08 13:52:47 2024 -0800
committer Copybara-Service <copybara-worker@google.com> Mon Jan 08 13:55:14 2024 -0800
tree 85257a7c14da991930c6c102a853603fb6520517
parent 1aaa98a297d99b6b226c7bf3dbeb81b98376a92c

Update `ActionTemplateExpansionValue.ActionTemplateExpansionKey` to use `@AutoCodec.Interner` instead of `@AutoCodec.Instantiator`.

PiperOrigin-RevId: 596693171
Change-Id: I4b32a6b2ab4e40049f63e78afedd0751b5b07b26

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

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionValue.java
index cbdd287..c8b1559 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ActionTemplateExpansionValue.java
@@ -21,9 +21,11 @@
 import com.google.devtools.build.lib.actions.BasicActionLookupValue;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.skyframe.config.BuildConfigurationKey;
+import com.google.devtools.build.lib.skyframe.serialization.VisibleForSerialization;
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
 import com.google.devtools.build.skyframe.SkyFunctionName;
 import com.google.devtools.build.skyframe.SkyKey;
+import com.google.devtools.build.skyframe.SkyKey.SkyKeyInterner;
 
 /** Value that stores expanded actions from ActionTemplate. */
 public final class ActionTemplateExpansionValue extends BasicActionLookupValue {
@@ -50,11 +52,16 @@
     }
 
     @VisibleForTesting
-    @AutoCodec.Instantiator
     public static ActionTemplateExpansionKey of(ActionLookupKey actionLookupKey, int actionIndex) {
       return interner.intern(new ActionTemplateExpansionKey(actionLookupKey, actionIndex));
     }
 
+    @VisibleForSerialization
+    @AutoCodec.Interner
+    static ActionTemplateExpansionKey intern(ActionTemplateExpansionKey key) {
+      return interner.intern(key);
+    }
+
     @Override
     public SkyFunctionName functionName() {
       return SkyFunctions.ACTION_TEMPLATE_EXPANSION;