Evaluate the RepositoryMapping in StarlarkMapActionTemplate and re-wrap it in a new supplier to be passed to the StarlarkTemplateContext.

This prevents `AnalysisEnvironment` (specifically `CachingAnalysisEnvironment`) from being captured by the supplier and hence require that it be serialized.

Additionally, add serialization checking to `StarlarkMapActionTemplateTest`.

PiperOrigin-RevId: 825479304
Change-Id: I8c3c1fd04f7ddd107951b5314fbd9577ed3b4dce

Author: zhengwei143

src/main/java/com/google/devtools/build/lib/analysis/actions/StarlarkMapActionTemplate.java

@@ -102,7 +102,7 @@ public final class StarlarkMapActionTemplate extends ActionKeyComputer
   private final ImmutableMap<String, String> executionRequirements;
   private final OutputPathsMode outputPathsMode;
   private final ActionEnvironment env;
-  private final InterruptibleSupplier<RepositoryMapping> repoMappingSupplier;
+  private final RepositoryMapping repoMapping;
   private final String expandedActionsMnemonic;
   private final StarlarkFunction implementation;
   private final StarlarkSemantics semantics;
@@ -124,7 +124,7 @@ public StarlarkMapActionTemplate(
       StarlarkFunction implementation,
       StarlarkSemantics semantics,
       SymbolGenerator<?> symbolGenerator)
-      throws EvalException {
+      throws EvalException, InterruptedException {
     NestedSetBuilder<Artifact> allInputsNsBuilder = NestedSetBuilder.<Artifact>stableOrder();
     NestedSetBuilder<Artifact> toolsNsBuilder = NestedSetBuilder.<Artifact>stableOrder();
     this.actionOwner = actionOwner;
@@ -149,7 +149,7 @@ public StarlarkMapActionTemplate(
     this.executionRequirements = executionRequirements;
     this.outputPathsMode = outputPathsMode;
     this.env = env;
-    this.repoMappingSupplier = repoMappingSupplier;
+    this.repoMapping = repoMappingSupplier.get();
     this.expandedActionsMnemonic = expandedActionsMnemonic;
     this.implementation = implementation;
     this.semantics = semantics;
@@ -224,7 +224,7 @@ public ImmutableList<SpawnAction> generateActionsForInputArtifacts(
             actionOwner,
             artifactOwner,
             spawnActionBuilder,
-            repoMappingSupplier,
+            () -> repoMapping,
             ImmutableSet.copyOf(outputDirectories.values()));
 
     ImmutableMap.Builder<String, ExpandedDirectory> expandedDirectories = ImmutableMap.builder();

src/test/java/com/google/devtools/build/lib/starlark/BUILD

@@ -420,6 +420,7 @@ java_test(
         "//src/main/java/com/google/devtools/build/lib/util/io:out-err",
         "//src/main/java/com/google/devtools/build/lib/vfs",
         "//src/test/java/com/google/devtools/build/lib/buildtool/util",
+        "//src/test/java/com/google/devtools/build/lib/testutil:SkyframeExecutorTestHelper",
         "//src/test/java/com/google/devtools/build/lib/testutil:TestConstants",
         "//third_party:guava",
         "//third_party:junit4",

src/test/java/com/google/devtools/build/lib/starlark/StarlarkMapActionTemplateTest.java

@@ -27,6 +27,7 @@
 import com.google.devtools.build.lib.buildtool.util.BuildIntegrationTestCase;
 import com.google.devtools.build.lib.skyframe.ActionTemplateExpansionValue;
 import com.google.devtools.build.lib.skyframe.ActionTemplateExpansionValue.ActionTemplateExpansionKey;
+import com.google.devtools.build.lib.testutil.SkyframeExecutorTestHelper;
 import com.google.devtools.build.lib.testutil.TestConstants;
 import com.google.devtools.build.lib.util.io.RecordingOutErr;
 import com.google.devtools.build.lib.vfs.FileSystemUtils;
@@ -171,6 +172,7 @@ def split_directory_impl(
 
   @Test
   public void doSimpleMappingWithAdditionalInputsAndParams() throws Exception {
+    SkyframeExecutorTestHelper.process(getSkyframeExecutor());
     write(
         "test/rule_def.bzl",
         """
@@ -208,6 +210,7 @@ def rule_impl(ctx):
 
   @Test
   public void multipleInputDirectories() throws Exception {
+    SkyframeExecutorTestHelper.process(getSkyframeExecutor());
     write(
         "test/rule_def.bzl",
         """
@@ -241,6 +244,7 @@ def rule_impl(ctx):
 
   @Test
   public void multipleOutputDirectories() throws Exception {
+    SkyframeExecutorTestHelper.process(getSkyframeExecutor());
     write(
         "test/rule_def.bzl",
         """
@@ -276,6 +280,7 @@ def rule_impl(ctx):
 
   @Test
   public void outputDirectoriesCanBeChainedToSubsequentMapDirectoryCalls() throws Exception {
+    SkyframeExecutorTestHelper.process(getSkyframeExecutor());
     write(
         "test/rule_def.bzl",
         """
@@ -337,6 +342,7 @@ def rule_impl(ctx):
 
   @Test
   public void executionRequirementsPropagatedToExpandedActions() throws Exception {
+    SkyframeExecutorTestHelper.process(getSkyframeExecutor());
     write(
         "test/rule_def.bzl",
         """
@@ -377,6 +383,7 @@ def rule_impl(ctx):
 
   @Test
   public void actionEnvironmentPropagatedToExpandedActions() throws Exception {
+    SkyframeExecutorTestHelper.process(getSkyframeExecutor());
     write(
         "test/rule_def.bzl",
         """
@@ -462,6 +469,7 @@ def rule_impl(ctx):
   @TestParameters("{value: 'set()', errorType: 'set'}")
   // Only boolean integer and strings are allowed in additional_params.
   public void disallowedAdditionalParams(String value, String errorType) throws Exception {
+    SkyframeExecutorTestHelper.process(getSkyframeExecutor());
     write(
         "test/rule_def.bzl",
         String.format(
@@ -504,6 +512,7 @@ def rule_impl(ctx):
   @TestParameters("{inputs: '{}', outputs: '{\"output_dir\": output_dir}', errorType: 'input'}")
   public void emptyInputOrOutputDirectoriesNotAllowed(
       String inputs, String outputs, String errorType) throws Exception {
+    SkyframeExecutorTestHelper.process(getSkyframeExecutor());
     write(
         "test/rule_def.bzl",
         String.format(
@@ -533,6 +542,7 @@ def rule_impl(ctx):
 
   @Test
   public void failingImplementation() throws Exception {
+    SkyframeExecutorTestHelper.process(getSkyframeExecutor());
     write(
         "test/rule_def.bzl",
         """
@@ -566,6 +576,7 @@ def rule_impl(ctx):
 
   @Test
   public void cannotDeclareFileInNonOutputDirectory() throws Exception {
+    SkyframeExecutorTestHelper.process(getSkyframeExecutor());
     write(
         "test/rule_def.bzl",
         """
@@ -601,6 +612,8 @@ def rule_impl(ctx):
 
   @Test
   public void actionConflicts_conflictingOutputsInSameDirectory() throws Exception {
+    // Don't check serialization here, since the action conflict only occurs during execution,
+    // but serialization checks end up throwing (due to action conflicts) before we get there.
     write(
         "test/rule_def.bzl",
         """
@@ -651,6 +664,7 @@ def rule_impl(ctx):
   @TestParameters("{output: 'some_file', path: 'test/some_file'}")
   public void actionConflicts_conflictingOutputsFromOtherContext(String output, String path)
       throws Exception {
+    SkyframeExecutorTestHelper.process(getSkyframeExecutor());
     write(
         "test/rule_def.bzl",
         String.format(
@@ -717,6 +731,7 @@ def rule_impl(ctx):
   @TestParameters("{value: '(1, 2)', repr: '\\(1, 2\\)'}")
   public void implementationWithNonNoneReturnValueDisallowed(String value, String repr)
       throws Exception {
+    SkyframeExecutorTestHelper.process(getSkyframeExecutor());
     write(
         "test/rule_def.bzl",
         String.format(
@@ -760,6 +775,7 @@ def rule_impl(ctx):
   public void nonTopLevelImplementationsDisallowed(
       @TestParameter({"non_top_level_impl", "lambda_impl"}) String implementation)
       throws Exception {
+    SkyframeExecutorTestHelper.process(getSkyframeExecutor());
     write(
         "test/rule_def.bzl",
         String.format(