Add enum unboxing tests with side effects in initializers
Change-Id: I0e5e5272d673d65dc59300927e0557b7b85b1128
diff --git a/src/main/java/com/android/tools/r8/utils/InternalOptions.java b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
index b8f02fe..f9f955c 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -1150,6 +1150,12 @@
enableNameReflectionOptimization = false;
}
+ @VisibleForTesting
+ public void enableEnumUnboxing() {
+ assert !enableEnumUnboxing;
+ enableEnumUnboxing = true;
+ }
+
// TODO(b/69963623): Remove this once enabled.
@VisibleForTesting
public void enablePropagationOfConstantsAtCallSites() {
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EnumClinitWithSideEffectsUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/EnumClinitWithSideEffectsUnboxingTest.java
new file mode 100644
index 0000000..2fbd235
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EnumClinitWithSideEffectsUnboxingTest.java
@@ -0,0 +1,55 @@
+package com.android.tools.r8.enumunboxing;
+
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.utils.InternalOptions;
+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 EnumClinitWithSideEffectsUnboxingTest extends EnumUnboxingTestBase {
+
+ private final KeepRule enumKeepRule;
+ private final TestParameters parameters;
+
+ @Parameters(name = "{1}, enum keep rule: {0}")
+ public static List<Object[]> data() {
+ return buildParameters(
+ getAllEnumKeepRules(), getTestParameters().withAllRuntimesAndApiLevels().build());
+ }
+
+ public EnumClinitWithSideEffectsUnboxingTest(KeepRule enumKeepRule, TestParameters parameters) {
+ this.enumKeepRule = enumKeepRule;
+ this.parameters = parameters;
+ }
+
+ @Test
+ public void test() throws Exception {
+ testForR8(parameters.getBackend())
+ .addInnerClasses(EnumClinitWithSideEffectsUnboxingTest.class)
+ .addKeepMainRule(TestClass.class)
+ .addKeepRules(enumKeepRule.getKeepRule())
+ .addOptionsModification(InternalOptions::enableEnumUnboxing)
+ .setMinApi(parameters.getApiLevel())
+ .compile()
+ .run(parameters.getRuntime(), TestClass.class)
+ .assertSuccessWithOutputLines("Hello world!");
+ }
+
+ static class TestClass {
+
+ static MyEnum f = MyEnum.A;
+
+ public static void main(String[] args) {}
+ }
+
+ enum MyEnum {
+ A;
+
+ static {
+ System.out.println("Hello world!");
+ }
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EnumInitWithSideEffectsUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/EnumInitWithSideEffectsUnboxingTest.java
new file mode 100644
index 0000000..d353692
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EnumInitWithSideEffectsUnboxingTest.java
@@ -0,0 +1,55 @@
+package com.android.tools.r8.enumunboxing;
+
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.utils.InternalOptions;
+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 EnumInitWithSideEffectsUnboxingTest extends EnumUnboxingTestBase {
+
+ private final KeepRule enumKeepRule;
+ private final TestParameters parameters;
+
+ @Parameters(name = "{1}, enum keep rule: {0}")
+ public static List<Object[]> data() {
+ return buildParameters(
+ getAllEnumKeepRules(), getTestParameters().withAllRuntimesAndApiLevels().build());
+ }
+
+ public EnumInitWithSideEffectsUnboxingTest(KeepRule enumKeepRule, TestParameters parameters) {
+ this.enumKeepRule = enumKeepRule;
+ this.parameters = parameters;
+ }
+
+ @Test
+ public void test() throws Exception {
+ testForR8(parameters.getBackend())
+ .addInnerClasses(EnumInitWithSideEffectsUnboxingTest.class)
+ .addKeepMainRule(TestClass.class)
+ .addKeepRules(enumKeepRule.getKeepRule())
+ .addOptionsModification(InternalOptions::enableEnumUnboxing)
+ .setMinApi(parameters.getApiLevel())
+ .compile()
+ .run(parameters.getRuntime(), TestClass.class)
+ .assertSuccessWithOutputLines("Hello world!");
+ }
+
+ static class TestClass {
+
+ static MyEnum f = MyEnum.A;
+
+ public static void main(String[] args) {}
+ }
+
+ enum MyEnum {
+ A;
+
+ MyEnum() {
+ System.out.println("Hello world!");
+ }
+ }
+}
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 e03d352..e367418 100644
--- a/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingTestBase.java
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EnumUnboxingTestBase.java
@@ -96,4 +96,8 @@
BooleanUtils.values(),
KEEP_ENUM);
}
+
+ static List<KeepRule> getAllEnumKeepRules() {
+ return KEEP_ENUM;
+ }
}