From 611fdbb78e0af43b8ff3cd5909f1a99d66670a3f Mon Sep 17 00:00:00 2001
From: Googler <noreply@google.com>
Date: Tue, 16 Jan 2024 12:36:15 -0800
Subject: [PATCH] Update `RepositoryMappingValue` to use `@AutoCodec.Interner`
 instead of `@AutoCodec.Instantiator`.

PiperOrigin-RevId: 598923474
Change-Id: Ie14e5ed6dedc92d74ba6da208f6e8772a63b1cea
---
 .../java/com/google/devtools/build/lib/skyframe/BUILD     | 1 +
 .../build/lib/skyframe/RepositoryMappingValue.java        | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BUILD b/src/main/java/com/google/devtools/build/lib/skyframe/BUILD
index d2dfb7648e4a81..1f6de31b36bd27 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/BUILD
@@ -2260,6 +2260,7 @@ java_library(
         ":sky_functions",
         "//src/main/java/com/google/devtools/build/lib/bazel/bzlmod:common",
         "//src/main/java/com/google/devtools/build/lib/cmdline",
+        "//src/main/java/com/google/devtools/build/lib/skyframe/serialization:visible-for-serialization",
         "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec",
         "//src/main/java/com/google/devtools/build/lib/util:detailed_exit_code",
         "//src/main/java/com/google/devtools/build/lib/util:exit_code",
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/RepositoryMappingValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/RepositoryMappingValue.java
index 54bfef21ca5545..8e38bba78feef0 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/RepositoryMappingValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/RepositoryMappingValue.java
@@ -18,6 +18,7 @@
 import com.google.devtools.build.lib.bazel.bzlmod.Version;
 import com.google.devtools.build.lib.cmdline.RepositoryMapping;
 import com.google.devtools.build.lib.cmdline.RepositoryName;
+import com.google.devtools.build.lib.skyframe.serialization.VisibleForSerialization;
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
 import com.google.devtools.build.lib.util.DetailedExitCode;
 import com.google.devtools.build.lib.util.ExitCode;
@@ -145,12 +146,17 @@ public abstract static class Key implements SkyKey {
      */
     abstract boolean rootModuleShouldSeeWorkspaceRepos();
 
-    @AutoCodec.Instantiator
     static Key create(RepositoryName repoName, boolean rootModuleShouldSeeWorkspaceRepos) {
       return interner.intern(
           new AutoValue_RepositoryMappingValue_Key(repoName, rootModuleShouldSeeWorkspaceRepos));
     }
 
+    @VisibleForSerialization
+    @AutoCodec.Interner
+    static Key intern(Key key) {
+      return interner.intern(key);
+    }
+
     @Override
     public SkyFunctionName functionName() {
       return SkyFunctions.REPOSITORY_MAPPING;