Support ParamFileActionInput in LocalSpawnRunner.

RELNOTES: None
PiperOrigin-RevId: 194798051

2 files changed, 37 insertions, 8 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/actions/CommandLines.java b/src/main/java/com/google/devtools/build/lib/actions/CommandLines.java
index fef7c2d31f..2e29fab1a4 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/CommandLines.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/CommandLines.java
@@ -17,6 +17,7 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.lib.actions.Artifact.ArtifactExpander;
+import com.google.devtools.build.lib.actions.ParameterFile.ParameterFileType;
 import com.google.devtools.build.lib.actions.cache.VirtualActionInput;
 import com.google.devtools.build.lib.collect.IterablesChain;
 import com.google.devtools.build.lib.util.Fingerprint;
@@ -24,6 +25,7 @@ import com.google.devtools.build.lib.vfs.PathFragment;
 import com.google.protobuf.ByteString;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -167,7 +169,12 @@ public class CommandLines {
                   .replaceFirst("%s", paramFileExecPath.getPathString());
           arguments.addElement(paramArg);
           cmdLineLength += paramArg.length() + 1;
-          paramFiles.add(new ParamFileActionInput(paramFileExecPath, args, paramFileInfo));
+          paramFiles.add(
+              new ParamFileActionInput(
+                  paramFileExecPath,
+                  args,
+                  paramFileInfo.getFileType(),
+                  paramFileInfo.getCharset()));
         }
       }
     }
@@ -221,22 +228,27 @@ public class CommandLines {
     }
   }
 
-  static final class ParamFileActionInput implements VirtualActionInput {
+  /** An in-memory param file virtual action input. */
+  public static final class ParamFileActionInput implements VirtualActionInput {
     final PathFragment paramFileExecPath;
     final Iterable<String> arguments;
-    final ParamFileInfo paramFileInfo;
+    final ParameterFileType type;
+    final Charset charset;
 
-    ParamFileActionInput(
-        PathFragment paramFileExecPath, Iterable<String> arguments, ParamFileInfo paramFileInfo) {
+    public ParamFileActionInput(
+        PathFragment paramFileExecPath,
+        Iterable<String> arguments,
+        ParameterFileType type,
+        Charset charset) {
       this.paramFileExecPath = paramFileExecPath;
       this.arguments = arguments;
-      this.paramFileInfo = paramFileInfo;
+      this.type = type;
+      this.charset = charset;
     }
 
     @Override
     public void writeTo(OutputStream out) throws IOException {
-      ParameterFile.writeParameterFile(
-          out, arguments, paramFileInfo.getFileType(), paramFileInfo.getCharset());
+      ParameterFile.writeParameterFile(out, arguments, type, charset);
     }
 
     @Override
diff --git a/src/main/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunner.java b/src/main/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunner.java
index e22da3ef85..cd4075f6bb 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunner.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/local/LocalSpawnRunner.java
@@ -22,12 +22,15 @@ import com.google.common.base.Joiner;
 import com.google.common.base.Preconditions;
 import com.google.common.io.ByteStreams;
 import com.google.devtools.build.lib.actions.ActionExecutionMetadata;
+import com.google.devtools.build.lib.actions.ActionInput;
+import com.google.devtools.build.lib.actions.CommandLines.ParamFileActionInput;
 import com.google.devtools.build.lib.actions.ResourceManager;
 import com.google.devtools.build.lib.actions.ResourceManager.ResourceHandle;
 import com.google.devtools.build.lib.actions.Spawn;
 import com.google.devtools.build.lib.actions.SpawnResult;
 import com.google.devtools.build.lib.actions.SpawnResult.Status;
 import com.google.devtools.build.lib.actions.Spawns;
+import com.google.devtools.build.lib.actions.cache.VirtualActionInput;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadSafe;
 import com.google.devtools.build.lib.exec.SpawnRunner;
 import com.google.devtools.build.lib.runtime.ProcessWrapperUtil;
@@ -241,6 +244,20 @@ public class LocalSpawnRunner implements SpawnRunner {
         context.prefetchInputs();
       }
 
+      for (ActionInput input : spawn.getInputFiles()) {
+        if (input instanceof ParamFileActionInput) {
+          VirtualActionInput virtualActionInput = (VirtualActionInput) input;
+          Path outputPath = execRoot.getRelative(virtualActionInput.getExecPath());
+          if (outputPath.exists()) {
+            outputPath.delete();
+          }
+          outputPath.getParentDirectory().createDirectoryAndParents();
+          try (OutputStream outputStream = outputPath.getOutputStream()) {
+            virtualActionInput.writeTo(outputStream);
+          }
+        }
+      }
+
       stepLog(INFO, "running locally");
       setState(State.LOCAL_ACTION_RUNNING);