commit 45010535bc5cb724696d275c91e1d479f0008b9a
author Jinseong Jeon <jsjeon@google.com> Fri Sep 06 17:43:49 2019 -0700
committer Jinseong Jeon <jsjeon@google.com> Mon Sep 09 18:53:33 2019 +0000
tree 555dc72bf93dc4d099f69f6990a34711e72a75f1
parent 699e0ad402eb7bcb6d25e94822b1fdf9b20674bf

Make sure constants that are not swapped are indeed used by array-put.

Bug: 140588497
Change-Id: I9e89025b6b974c6f394cc279c67f0cc9ee95140b

src/main/java/com/android/tools/r8/ir/optimize/CodeRewriter.java

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/CodeRewriter.java b/src/main/java/com/android/tools/r8/ir/optimize/CodeRewriter.java
index 99b38dc..2511133 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/CodeRewriter.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/CodeRewriter.java
@@ -2456,7 +2456,7 @@
         Instruction uniqueUse = uniqueUsers.iterator().next();
         if (iterator.hasNext()) {
           Instruction nextNext = iterator.next();
-          if (uniqueUse == nextNext) {
+          if (uniqueUse == nextNext && nextNext.isArrayPut()) {
             assert !uniqueUse.isConstInstruction();
             continue;
           }
@@ -2467,7 +2467,9 @@
                 && iterator.hasNext()) {
               Instruction nextNextNext = iterator.peekNext();
               Instruction uniqueUseNext = uniqueUsersNext.iterator().next();
-              if (uniqueUse == nextNextNext && uniqueUseNext == nextNextNext) {
+              if (uniqueUse == nextNextNext
+                  && uniqueUseNext == nextNextNext
+                  && nextNextNext.isArrayPut()) {
                 continue;
               }
             }

src/test/java/com/android/tools/r8/ir/regalloc/B140588497.java

diff --git a/src/test/java/com/android/tools/r8/ir/regalloc/B140588497.java b/src/test/java/com/android/tools/r8/ir/regalloc/B140588497.java
new file mode 100644
index 0000000..33bbb4d
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/ir/regalloc/B140588497.java
@@ -0,0 +1,67 @@
+// Copyright (c) 2019, the R8 project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+package com.android.tools.r8.ir.regalloc;
+
+import static com.android.tools.r8.utils.codeinspector.Matchers.isPresent;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestParametersCollection;
+import com.android.tools.r8.utils.codeinspector.ClassSubject;
+import com.android.tools.r8.utils.codeinspector.InstructionSubject;
+import com.android.tools.r8.utils.codeinspector.MethodSubject;
+import java.util.Iterator;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public class B140588497 extends TestBase {
+
+  @Parameterized.Parameters(name = "{0}")
+  public static TestParametersCollection data() {
+    return getTestParameters().withDexRuntimes().build();
+  }
+
+  private final TestParameters parameters;
+
+  public B140588497(TestParameters parameters) {
+    this.parameters = parameters;
+  }
+
+  @Test
+  public void testD8() throws Exception {
+    testForD8()
+        .addInnerClasses(B140588497.class)
+        .setMinApi(parameters.getRuntime())
+        .compile()
+        .inspect(inspector -> {
+          ClassSubject c = inspector.clazz(TestClass.class);
+          assertThat(c, isPresent());
+
+          MethodSubject m = c.uniqueMethodWithName("invokeRangeTest");
+          assertThat(m, isPresent());
+          long prev;
+          long curr = -1;
+          Iterator<InstructionSubject> it =
+              m.iterateInstructions(InstructionSubject::isConstNumber);
+          while (it.hasNext()) {
+            InstructionSubject instr = it.next();
+            prev = curr;
+            curr = instr.getConstNumber();
+            assertTrue(prev < curr);
+          }
+        });
+  }
+
+  static class TestClass {
+    public static void invokeRangeTest() {
+      consumeManyLongs(0, 1, 2, 3, 4, 5);
+    }
+    public static void consumeManyLongs(long a, long b, long c, long d, long e, long f) {}
+  }
+
+}