Fix NewArrayFilled on unboxed enums
Bug: b/295978965
Change-Id: I64e36e0713936fdff16dd904a8fd944f963dbb1c
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/enums/EnumUnboxingRewriter.java b/src/main/java/com/android/tools/r8/ir/optimize/enums/EnumUnboxingRewriter.java
index e0774e9..b30fae9 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/enums/EnumUnboxingRewriter.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/enums/EnumUnboxingRewriter.java
@@ -191,7 +191,7 @@
iterator,
instruction.asInvokeMethodWithReceiver());
} else if (instruction.isNewArrayFilled()) {
- rewriteNewArrayFilled(instruction.asNewArrayFilled(), code, iterator);
+ rewriteNewArrayFilled(instruction.asNewArrayFilled(), code, convertedEnums, iterator);
} else if (instruction.isInvokeStatic()) {
rewriteInvokeStatic(
instruction.asInvokeStatic(),
@@ -484,7 +484,10 @@
}
private void rewriteNewArrayFilled(
- NewArrayFilled newArrayFilled, IRCode code, InstructionListIterator instructionIterator) {
+ NewArrayFilled newArrayFilled,
+ IRCode code,
+ Map<Instruction, DexType> convertedEnums,
+ InstructionListIterator instructionIterator) {
DexType arrayBaseType = newArrayFilled.getArrayType().toBaseType(factory);
if (!unboxedEnumsData.isUnboxedEnum(arrayBaseType)) {
return;
@@ -506,11 +509,13 @@
elements.add(element);
}
}
- instructionIterator.replaceCurrentInstruction(
+ NewArrayFilled newArray =
new NewArrayFilled(
rewrittenArrayType,
code.createValue(factory.intArrayType.toTypeElement(appView, definitelyNotNull())),
- elements));
+ elements);
+ instructionIterator.replaceCurrentInstruction(newArray);
+ convertedEnums.put(newArray, newArrayFilled.getArrayType());
}
private void rewriteInvokeStatic(
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingArrayCreationTest.java b/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingArrayCreationTest.java
new file mode 100644
index 0000000..b10fa45
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingArrayCreationTest.java
@@ -0,0 +1,65 @@
+// Copyright (c) 2023, 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.enumunboxing;
+
+import com.android.tools.r8.NeverClassInline;
+import com.android.tools.r8.TestParameters;
+import java.util.List;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class EnumUnboxingArrayCreationTest extends EnumUnboxingTestBase {
+
+ private final TestParameters parameters;
+ private final boolean enumValueOptimization;
+ private final EnumKeepRules enumKeepRules;
+
+ @Parameters(name = "{0} valueOpt: {1} keep: {2}")
+ public static List<Object[]> data() {
+ return enumUnboxingTestParameters();
+ }
+
+ public EnumUnboxingArrayCreationTest(
+ TestParameters parameters, boolean enumValueOptimization, EnumKeepRules enumKeepRules) {
+ this.parameters = parameters;
+ this.enumValueOptimization = enumValueOptimization;
+ this.enumKeepRules = enumKeepRules;
+ }
+
+ @Test
+ public void testEnumUnboxing() throws Exception {
+ testForR8(parameters.getBackend())
+ .addInnerClasses(getClass())
+ .addKeepMainRules(ArrayCreation.class)
+ .enableNeverClassInliningAnnotations()
+ .addKeepRules(enumKeepRules.getKeepRules())
+ .addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
+ .addEnumUnboxingInspector(inspector -> inspector.assertUnboxed(ArrayCreation.MyEnum.class))
+ .setMinApi(parameters)
+ .run(parameters.getRuntime(), ArrayCreation.class)
+ .assertSuccessWithOutputLines("true", "false", "true", "false", "true");
+ }
+
+ public static class ArrayCreation {
+
+ public static void main(String[] args) {
+ MyEnum[] myEnums = {null, MyEnum.A, null, MyEnum.B, null};
+ System.out.println(myEnums[0] == null);
+ System.out.println(myEnums[1] == null);
+ System.out.println(myEnums[2] == null);
+ System.out.println(myEnums[3] == null);
+ System.out.println(myEnums[4] == null);
+ }
+
+ @NeverClassInline
+ enum MyEnum {
+ A,
+ B;
+ }
+ }
+}
