commit 038d9fa09ae81f9a42399699981068fd5930922e
author Rico Wind <ricow@google.com> Wed Mar 29 09:48:43 2023 +0200
committer Rico Wind <ricow@google.com> Wed Mar 29 09:22:17 2023 +0000
tree a54b881dfb8c1bc7a0843a8a209980fb866a2081
parent 147ce6978b8b4d87a4f6872af036dc1bd2de725a

Correctly pass --32 for all art invocations when set (bots only)

Bug: b/274840966
Change-Id: Ibeff3f0a446fdf4fd847e42fe76ec0345576c090

src/test/java/com/android/tools/r8/TestCompileResult.java

diff --git a/src/test/java/com/android/tools/r8/TestCompileResult.java b/src/test/java/com/android/tools/r8/TestCompileResult.java
index ce189e6..dfdfa9d 100644
--- a/src/test/java/com/android/tools/r8/TestCompileResult.java
+++ b/src/test/java/com/android/tools/r8/TestCompileResult.java
@@ -660,11 +660,9 @@
             .add(out.toString())
             .build();
     Consumer<ArtCommandBuilder> commandConsumer =
-        ToolHelper.force32BitArt()
-            ? builder -> builder.appendArtOption("--32")
-            : withArt6Plus64BitsLib && vm.getVersion().isNewerThanOrEqual(DexVm.Version.V6_0_1)
-                ? builder -> builder.appendArtOption("--64")
-                : builder -> {};
+        withArt6Plus64BitsLib && vm.getVersion().isNewerThanOrEqual(DexVm.Version.V6_0_1)
+            ? builder -> builder.appendArtOption("--64")
+            : builder -> {};
     commandConsumer =
         commandConsumer.andThen(
             builder -> {

src/test/java/com/android/tools/r8/ToolHelper.java

diff --git a/src/test/java/com/android/tools/r8/ToolHelper.java b/src/test/java/com/android/tools/r8/ToolHelper.java
index 1de3552..404c51d 100644
--- a/src/test/java/com/android/tools/r8/ToolHelper.java
+++ b/src/test/java/com/android/tools/r8/ToolHelper.java
@@ -488,9 +488,8 @@
         result.add("/bin/bash");
       }
       result.add(getExecutable());
-      for (String option : options) {
-        result.add(option);
-      }
+      result.addAll(getExecutableArguments());
+      result.addAll(options);
       for (Map.Entry<String, String> entry : systemProperties.entrySet()) {
         StringBuilder builder = new StringBuilder("-D");
         builder.append(entry.getKey());
@@ -508,9 +507,7 @@
       if (mainClass != null) {
         result.add(mainClass);
       }
-      for (String argument : programArguments) {
-        result.add(argument);
-      }
+      result.addAll(programArguments);
       return result;
     }
 
@@ -529,6 +526,8 @@
     protected abstract boolean shouldUseDocker();
 
     protected abstract String getExecutable();
+
+    protected abstract List<String> getExecutableArguments();
   }
 
   public static class ArtCommandBuilder extends CommandBuilder {
@@ -563,6 +562,11 @@
       return version != null ? getArtBinary(version) : getArtBinary();
     }
 
+    @Override
+    protected List<String> getExecutableArguments() {
+      return force32BitArt() ? ImmutableList.of("--32") : ImmutableList.of();
+    }
+
     public boolean isForDevice() {
       return version.getKind() == Kind.TARGET;
     }