Enum unboxing: test for enum arrays
Bug: 147860220
Change-Id: I66a7af725b418262b4785f50df32b157decea356
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingArrayTest.java b/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingArrayTest.java
new file mode 100644
index 0000000..7d6f2ac
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingArrayTest.java
@@ -0,0 +1,174 @@
+// Copyright (c) 2020, 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.NeverInline;
+import com.android.tools.r8.R8TestCompileResult;
+import com.android.tools.r8.R8TestRunResult;
+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 EnumUnboxingArrayTest extends EnumUnboxingTestBase {
+
+ private static final Class<?>[] FAILURES = {
+ EnumVarArgs.class,
+ EnumArrayReadWriteNoEscape.class,
+ EnumArrayReadWrite.class,
+ Enum2DimArrayReadWrite.class
+ };
+
+ private final TestParameters parameters;
+ private final boolean enumValueOptimization;
+ private final KeepRule enumKeepRules;
+
+ @Parameters(name = "{0} valueOpt: {1} keep: {2}")
+ public static List<Object[]> data() {
+ return enumUnboxingTestParameters();
+ }
+
+ public EnumUnboxingArrayTest(
+ TestParameters parameters, boolean enumValueOptimization, KeepRule enumKeepRules) {
+ this.parameters = parameters;
+ this.enumValueOptimization = enumValueOptimization;
+ this.enumKeepRules = enumKeepRules;
+ }
+
+ @Test
+ public void testEnumUnboxingFailure() throws Exception {
+ R8TestCompileResult compile =
+ testForR8(parameters.getBackend())
+ .addInnerClasses(EnumUnboxingArrayTest.class)
+ .addKeepMainRules(FAILURES)
+ .enableInliningAnnotations()
+ .enableNeverClassInliningAnnotations()
+ .addKeepRules(enumKeepRules.getKeepRule())
+ .addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
+ .allowDiagnosticInfoMessages()
+ .setMinApi(parameters.getApiLevel())
+ .compile();
+ for (Class<?> failure : FAILURES) {
+ R8TestRunResult run =
+ compile
+ .inspectDiagnosticMessages(
+ m ->
+ assertEnumIsBoxed(
+ failure.getDeclaredClasses()[0], failure.getSimpleName(), m))
+ .run(parameters.getRuntime(), failure)
+ .assertSuccess();
+ assertLines2By2Correct(run.getStdOut());
+ }
+ }
+
+ static class EnumVarArgs {
+
+ public static void main(String[] args) {
+ System.out.println(sum(MyEnum.A));
+ System.out.println(1);
+ System.out.println(sum(MyEnum.B, MyEnum.C));
+ System.out.println(2);
+ }
+
+ @NeverInline
+ public static int sum(MyEnum... args) {
+ return args.length;
+ }
+
+ @NeverClassInline
+ enum MyEnum {
+ A,
+ B,
+ C;
+ }
+ }
+
+ static class EnumArrayReadWriteNoEscape {
+
+ public static void main(String[] args) {
+ MyEnum[] myEnums = new MyEnum[2];
+ myEnums[1] = MyEnum.C;
+ System.out.println(myEnums[1].ordinal());
+ System.out.println(2);
+ System.out.println(myEnums[0]);
+ System.out.println("null");
+ myEnums[0] = MyEnum.B;
+ System.out.println(myEnums.length);
+ System.out.println(2);
+ }
+
+ @NeverClassInline
+ enum MyEnum {
+ A,
+ B,
+ C;
+ }
+ }
+
+ static class EnumArrayReadWrite {
+
+ public static void main(String[] args) {
+ MyEnum[] myEnums = getArray();
+ System.out.println(myEnums[1].ordinal());
+ System.out.println(2);
+ System.out.println(myEnums[0]);
+ System.out.println("null");
+ myEnums[0] = MyEnum.B;
+ System.out.println(sum(myEnums));
+ System.out.println(2);
+ }
+
+ @NeverInline
+ public static MyEnum[] getArray() {
+ MyEnum[] myEnums = new MyEnum[2];
+ myEnums[1] = MyEnum.C;
+ return myEnums;
+ }
+
+ @NeverInline
+ public static int sum(MyEnum[] args) {
+ return args.length;
+ }
+
+ @NeverClassInline
+ enum MyEnum {
+ A,
+ B,
+ C;
+ }
+ }
+
+ static class Enum2DimArrayReadWrite {
+
+ public static void main(String[] args) {
+ MyEnum[][] myEnums = getArray();
+ System.out.println(myEnums[1][1].ordinal());
+ System.out.println(2);
+ System.out.println(myEnums[0][0].ordinal());
+ System.out.println(1);
+ }
+
+ @NeverInline
+ public static MyEnum[][] getArray() {
+ MyEnum[][] myEnums = new MyEnum[2][2];
+ myEnums[1][1] = MyEnum.C;
+ myEnums[1][0] = MyEnum.A;
+ myEnums[0][0] = MyEnum.B;
+ myEnums[0][1] = MyEnum.A;
+ return myEnums;
+ }
+
+ @NeverClassInline
+ enum MyEnum {
+ A,
+ B,
+ C;
+ }
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingTestBase.java b/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingTestBase.java
index 1b56b1b..e03d352 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingTestBase.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingTestBase.java
@@ -73,6 +73,7 @@
}
void assertEnumIsUnboxed(Class<?> enumClass, String testName, TestDiagnosticMessages m) {
+ assertTrue(enumClass.isEnum());
Diagnostic diagnostic = m.getInfos().get(0);
assertTrue(diagnostic.getDiagnosticMessage().startsWith("Unboxed enums"));
assertTrue(
@@ -81,6 +82,7 @@
}
void assertEnumIsBoxed(Class<?> enumClass, String testName, TestDiagnosticMessages m) {
+ assertTrue(enumClass.isEnum());
Diagnostic diagnostic = m.getInfos().get(1);
assertTrue(diagnostic.getDiagnosticMessage().startsWith("Boxed enums"));
assertTrue(
