commit 9fe597db8a34dbc15939e9d48f8f969963a4fa1a
author cushon <cushon@google.com> Tue Oct 23 12:39:08 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Tue Oct 23 12:40:34 2018 -0700
tree f1e285197933aba2d6cdb2145d48a38269f4ebdc
parent b7747f37e6ce6bff24cf0aea42362d386833669a

Use a CommandLine to represent executable arguments in SpawnAction

This reduced analysis memory usage for actions that construct complex
argument lists.

PiperOrigin-RevId: 218388661

src/main/java/com/google/devtools/build/lib/actions/CommandLine.java

diff --git a/src/main/java/com/google/devtools/build/lib/actions/CommandLine.java b/src/main/java/com/google/devtools/build/lib/actions/CommandLine.java
index b87e5a6..1516fb0 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/CommandLine.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/CommandLine.java
@@ -16,9 +16,9 @@
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
 import com.google.devtools.build.lib.actions.Artifact.ArtifactExpander;
 import com.google.devtools.build.lib.collect.CollectionUtils;
+import com.google.devtools.build.lib.collect.IterablesChain;
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization;
 import com.google.devtools.build.lib.util.Fingerprint;
@@ -94,13 +94,13 @@
 
     @Override
     public Iterable<String> arguments() throws CommandLineExpansionException {
-      return Iterables.concat(executableArgs, commandLine.arguments());
+      return IterablesChain.concat(executableArgs, commandLine.arguments());
     }
 
     @Override
     public Iterable<String> arguments(ArtifactExpander artifactExpander)
         throws CommandLineExpansionException {
-      return Iterables.concat(executableArgs, commandLine.arguments(artifactExpander));
+      return IterablesChain.concat(executableArgs, commandLine.arguments(artifactExpander));
     }
   }
 
@@ -118,13 +118,13 @@
 
     @Override
     public Iterable<String> arguments() throws CommandLineExpansionException {
-      return Iterables.concat(commandLine.arguments(), executableArgs);
+      return IterablesChain.concat(commandLine.arguments(), executableArgs);
     }
 
     @Override
     public Iterable<String> arguments(ArtifactExpander artifactExpander)
         throws CommandLineExpansionException {
-      return Iterables.concat(commandLine.arguments(artifactExpander), executableArgs);
+      return IterablesChain.concat(commandLine.arguments(artifactExpander), executableArgs);
     }
   }
 
@@ -137,6 +137,9 @@
     if (executableArgs.isEmpty()) {
       return commandLine;
     }
+    if (commandLine == EMPTY) {
+      return CommandLine.of(executableArgs);
+    }
     return new PrefixedCommandLine(executableArgs, commandLine);
   }
 
@@ -149,6 +152,9 @@
     if (args.isEmpty()) {
       return commandLine;
     }
+    if (commandLine == EMPTY) {
+      return CommandLine.of(args);
+    }
     return new SuffixedCommandLine(args, commandLine);
   }