Version 1.5.59
Cherry-pick: Simpler reproduction of b/136717060
CL: https://r8-review.googlesource.com/c/r8/+/40367
Cherry-pick: Always consider wide registers clobbered when re-using constant instructions
CL: https://r8-review.googlesource.com/c/r8/+/40406
Bug: 136717060
Change-Id: I4df177701db964de35496cdae91df7cff9480883
diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java
index f12fbc7..a349d29 100644
--- a/src/main/java/com/android/tools/r8/Version.java
+++ b/src/main/java/com/android/tools/r8/Version.java
@@ -11,7 +11,7 @@
// This field is accessed from release scripts using simple pattern matching.
// Therefore, changing this field could break our release scripts.
- public static final String LABEL = "1.5.58";
+ public static final String LABEL = "1.5.59";
private Version() {
}
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/PeepholeOptimizer.java b/src/main/java/com/android/tools/r8/ir/optimize/PeepholeOptimizer.java
index 66a1106..87c0737 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/PeepholeOptimizer.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/PeepholeOptimizer.java
@@ -483,9 +483,8 @@
registerToNumber.put(outRegister, current.asConstNumber());
if (current.outType().isWide()) {
registerToNumber.remove(outRegister + 1);
- } else {
- removeWideConstantCovering(registerToNumber, outRegister);
}
+ removeWideConstantCovering(registerToNumber, outRegister);
}
} else {
// This instruction writes registers with a non-constant value. Remove the registers
diff --git a/src/test/java/com/android/tools/r8/ir/regalloc/B136717060.java b/src/test/java/com/android/tools/r8/ir/regalloc/B136717060.java
new file mode 100644
index 0000000..3de2b40
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/ir/regalloc/B136717060.java
@@ -0,0 +1,54 @@
+// 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 com.android.tools.r8.TestBase;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestParametersCollection;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(Parameterized.class)
+public class B136717060 extends TestBase {
+
+ private final TestParameters parameters;
+
+ @Parameterized.Parameters(name = "{0}")
+ public static TestParametersCollection data() {
+ return getTestParameters().withDexRuntimes().build();
+ }
+
+ public B136717060(TestParameters parameters) {
+ this.parameters = parameters;
+ }
+
+ @Test
+ public void test() throws Exception {
+ testForD8()
+ .addInnerClasses(B136717060.class)
+ .setMinApi(parameters.getRuntime())
+ .compile()
+ .run(parameters.getRuntime(), TestClass.class)
+ .assertSuccess();
+ }
+
+ static class TestClass {
+
+ public static void main(String[] args) {
+ test();
+ }
+
+ static void test() {
+ method(3L, 3L, 1L, 0L);
+ method(Long.MAX_VALUE, 1, Long.MAX_VALUE, 0L);
+ method(Long.MIN_VALUE, 3L, Long.MIN_VALUE / 3L - 1L, 1L);
+ method(Long.MIN_VALUE + 1, -1, Long.MAX_VALUE, 0L);
+ method(Long.MIN_VALUE, -1, Long.MIN_VALUE, 0L);
+ }
+
+ static void method(long x, long y, Object a, Object b) {}
+ }
+}
