Version 1.3.52
Cherry pick: Correctly mark and treat FillArrayData as a throwing instruction.
CL: https://r8-review.googlesource.com/c/r8/+/33037
Bug: 122887884
Change-Id: I22fe243a80807d0ee8517243d1bc1590d2a19497
diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java
index 48abc2a..6438e9b 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.3.51";
+ public static final String LABEL = "1.3.52";
private Version() {
}
diff --git a/src/main/java/com/android/tools/r8/code/FillArrayData.java b/src/main/java/com/android/tools/r8/code/FillArrayData.java
index 4569897..a49a31d 100644
--- a/src/main/java/com/android/tools/r8/code/FillArrayData.java
+++ b/src/main/java/com/android/tools/r8/code/FillArrayData.java
@@ -44,4 +44,9 @@
public String toSmaliString(ClassNameMapper naming) {
return formatSmaliString("v" + AA + ", :label_" + (getOffset() + BBBBBBBB));
}
+
+ @Override
+ public boolean canThrow() {
+ return true;
+ }
}
diff --git a/src/main/java/com/android/tools/r8/ir/code/NewArrayFilledData.java b/src/main/java/com/android/tools/r8/ir/code/NewArrayFilledData.java
index 0574e59..3274029 100644
--- a/src/main/java/com/android/tools/r8/ir/code/NewArrayFilledData.java
+++ b/src/main/java/com/android/tools/r8/ir/code/NewArrayFilledData.java
@@ -13,7 +13,6 @@
import com.android.tools.r8.ir.conversion.DexBuilder;
import com.android.tools.r8.ir.optimize.Inliner.ConstraintWithTarget;
import com.android.tools.r8.ir.optimize.InliningConstraints;
-import com.android.tools.r8.utils.InternalOptions;
import java.util.Arrays;
public class NewArrayFilledData extends Instruction {
@@ -96,9 +95,8 @@
}
@Override
- public boolean canBeDeadCode(IRCode code, InternalOptions options) {
- // Side-effects its input values.
- return false;
+ public boolean instructionTypeCanThrow() {
+ return true;
}
@Override
diff --git a/src/main/java/com/android/tools/r8/ir/conversion/DexSourceCode.java b/src/main/java/com/android/tools/r8/ir/conversion/DexSourceCode.java
index b588408..54c718d 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/DexSourceCode.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/DexSourceCode.java
@@ -351,6 +351,10 @@
return index;
}
if (dex.canThrow()) {
+ // TODO(zerny): Remove this from block computation.
+ if (dex.hasPayload()) {
+ arrayFilledDataPayloadResolver.addPayloadUser((FillArrayData) dex);
+ }
// If the instruction can throw and is in a try block, add edges to its catch successors.
Try tryRange = getTryForOffset(offset);
if (tryRange != null) {
@@ -393,10 +397,6 @@
builder.ensureNormalSuccessorBlock(offset, offset + dex.getSize());
return index;
}
- // TODO(zerny): Remove this from block computation.
- if (dex.hasPayload()) {
- arrayFilledDataPayloadResolver.addPayloadUser((FillArrayData) dex);
- }
// This instruction does not close the block.
return -1;
}
diff --git a/src/main/java/com/android/tools/r8/ir/conversion/IRBuilder.java b/src/main/java/com/android/tools/r8/ir/conversion/IRBuilder.java
index 93aa151..420bda3 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/IRBuilder.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/IRBuilder.java
@@ -1428,7 +1428,11 @@
}
public void addNewArrayFilledData(int arrayRef, int elementWidth, long size, short[] data) {
- add(new NewArrayFilledData(readRegister(arrayRef, ValueType.OBJECT), elementWidth, size, data));
+ NewArrayFilledData instruction =
+ new NewArrayFilledData(
+ readRegister(arrayRef, ValueType.OBJECT), elementWidth, size, data);
+ assert instruction.instructionTypeCanThrow();
+ addInstruction(instruction);
}
public void addNewInstance(int dest, DexType type) {
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 899e25d..17d478a 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
@@ -2169,6 +2169,9 @@
if (contents == null) {
continue;
}
+ if (block.hasCatchHandlers()) {
+ continue;
+ }
int arraySize = newArray.size().getConstInstruction().asConstNumber().getIntValue();
NewArrayFilledData fillArray = new NewArrayFilledData(
newArray.outValue(), elementSize, arraySize, contents);
diff --git a/src/test/java/com/android/tools/r8/regress/b122887884/Regress122887884.java b/src/test/java/com/android/tools/r8/regress/b122887884/Regress122887884.java
new file mode 100644
index 0000000..23650c9
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/regress/b122887884/Regress122887884.java
@@ -0,0 +1,28 @@
+// 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.regress.b122887884;
+
+public class Regress122887884 {
+
+ public static int[] foo(String[] args) {
+ if (args.length == 0) {
+ return new int[] {0, 0};
+ }
+ String first = args[0];
+ try {
+ String[] split = first.split("");
+ if (split.length != 2) {
+ // This results in a new-array v2 v2 int[] at which point the exception handler must split.
+ return new int[] {0, 0};
+ }
+ return new int[] {1, 1};
+ } catch (Throwable t) {
+ return new int[] {0, 0};
+ }
+ }
+
+ public static void main(String[] args) {
+ System.out.println(foo(args)[0]);
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/regress/b122887884/Regress122887884Runner.java b/src/test/java/com/android/tools/r8/regress/b122887884/Regress122887884Runner.java
new file mode 100644
index 0000000..54f32fd
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/regress/b122887884/Regress122887884Runner.java
@@ -0,0 +1,19 @@
+// 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.regress.b122887884;
+
+import com.android.tools.r8.TestBase;
+import com.android.tools.r8.utils.StringUtils;
+import org.junit.Test;
+
+public class Regress122887884Runner extends TestBase {
+
+ private final Class<?> CLASS = Regress122887884.class;
+ private final String EXPECTED = StringUtils.lines("0");
+
+ @Test
+ public void test() throws Exception {
+ testForD8().addProgramClasses(CLASS).run(CLASS).assertSuccessWithOutput(EXPECTED);
+ }
+}