Add test for unrelated instance field on unboxed enum
Bug: b/71823
Change-Id: I945f3e117329eb4fb35e1b5bd0c9cfb8254adef9
diff --git a/src/main/java/com/android/tools/r8/graph/AppView.java b/src/main/java/com/android/tools/r8/graph/AppView.java
index dc99fda..d262e6a 100644
--- a/src/main/java/com/android/tools/r8/graph/AppView.java
+++ b/src/main/java/com/android/tools/r8/graph/AppView.java
@@ -736,6 +736,9 @@
}
public boolean validateUnboxedEnumsHaveBeenPruned() {
+ if (app().options.testing.allowNotPrunedUnboxedEnums) {
+ return true;
+ }
for (DexType unboxedEnum : unboxedEnums.getUnboxedEnums()) {
assert appInfo.definitionForWithoutExistenceAssert(unboxedEnum) == null
: "Enum " + unboxedEnum + " has been unboxed but is still in the program.";
diff --git a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
index 7f3a36a..ce10279 100644
--- a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
+++ b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
@@ -2060,7 +2060,9 @@
|| appView.appInfo().getMainDexInfo().isTracedRoot(clazz, appView.getSyntheticItems())
: "Class " + clazz.toSourceString() + " was not a main dex root in the first round";
- assert !appView.unboxedEnums().isUnboxedEnum(clazz);
+ assert appView.options().testing.allowNotPrunedUnboxedEnums
+ || !appView.unboxedEnums().isUnboxedEnum(clazz)
+ : "Enum " + clazz.toSourceString() + " has been unboxed but is still in the program.";
if (options.isGeneratingClassFiles() && clazz.hasPermittedSubclassAttributes()) {
throw new CompilationError(
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 6bf0a8f..33b7e72 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -2043,6 +2043,7 @@
System.getProperty("com.android.tools.r8.disableMarkingClassesFinal") != null;
public boolean testEnableTestAssertions = false;
public boolean keepMetadataInR8IfNotRewritten = true;
+ public boolean allowNotPrunedUnboxedEnums = false;
// If set, pruned record fields are not used in hashCode/equals/toString and toString prints
// minified field names instead of original field names.
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EnumInstanceFieldReferenceInsideAndOutsideTest.java b/src/test/java/com/android/tools/r8/enumunboxing/EnumInstanceFieldReferenceInsideAndOutsideTest.java
new file mode 100644
index 0000000..8be968b
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EnumInstanceFieldReferenceInsideAndOutsideTest.java
@@ -0,0 +1,125 @@
+// Copyright (c) 2022, 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 static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertThrows;
+
+import com.android.tools.r8.CompilationFailedException;
+import com.android.tools.r8.NeverClassInline;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.ToolHelper.DexVm.Version;
+import java.util.List;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+/**
+ * This is a variant of a regression test for b/247146910 where the instance field on the enum is
+ * unrelated to enum unboxing.
+ */
+@RunWith(Parameterized.class)
+public class EnumInstanceFieldReferenceInsideAndOutsideTest 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 EnumInstanceFieldReferenceInsideAndOutsideTest(
+ TestParameters parameters, boolean enumValueOptimization, EnumKeepRules enumKeepRules) {
+ this.parameters = parameters;
+ this.enumValueOptimization = enumValueOptimization;
+ this.enumKeepRules = enumKeepRules;
+ }
+
+ @Test
+ public void testRuntime() throws Exception {
+ testForRuntime(parameters)
+ .addInnerClasses(EnumInstanceFieldReferenceInsideAndOutsideTest.class)
+ .run(parameters.getRuntime(), Main.class)
+ .assertSuccessWithOutputLines("42");
+ }
+
+ @Test
+ public void testEnumUnboxing() throws Exception {
+ // TODO(b/247146910): Should not throw.
+ assertThrows(
+ CompilationFailedException.class,
+ () ->
+ testForR8(parameters.getBackend())
+ .addInnerClasses(EnumInstanceFieldReferenceInsideAndOutsideTest.class)
+ .addKeepMainRule(Main.class)
+ .addKeepRules(enumKeepRules.getKeepRules())
+ .addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
+ .addEnumUnboxingInspector(inspector -> inspector.assertUnboxed(MyEnum.class))
+ .addNeverClassInliningAnnotations()
+ .setMinApi(parameters.getApiLevel())
+ .addOptionsModification(options -> options.testing.allowTypeErrors = true)
+ .allowDiagnosticWarningMessages()
+ .compileWithExpectedDiagnostics(
+ diagnostics ->
+ diagnostics.assertErrorMessageThatMatches(
+ containsString(
+ "Enum "
+ + typeName(MyEnum.class)
+ + " has been unboxed but is still in the program"))));
+ }
+
+ private boolean hasVerifyError() {
+ return parameters.getDexRuntimeVersion().isDalvik()
+ || parameters.getDexRuntimeVersion().isNewerThanOrEqual(Version.V12_0_0);
+ }
+
+ @Test
+ public void testEnumUnboxingAllowNotPrunedEnums() throws Exception {
+ testForR8(parameters.getBackend())
+ .addInnerClasses(EnumInstanceFieldReferenceInsideAndOutsideTest.class)
+ .addKeepMainRule(Main.class)
+ .addKeepRules(enumKeepRules.getKeepRules())
+ .addOptionsModification(
+ opt -> {
+ enableEnumOptions(opt, enumValueOptimization);
+ opt.testing.allowNotPrunedUnboxedEnums = true;
+ })
+ .addEnumUnboxingInspector(inspector -> inspector.assertUnboxed(MyEnum.class))
+ .addNeverClassInliningAnnotations()
+ .setMinApi(parameters.getApiLevel())
+ .addOptionsModification(options -> options.testing.allowTypeErrors = true)
+ .run(parameters.getRuntime(), Main.class)
+ // TODO(b/247146910): Should not fail with runtime error.
+ .assertFailureWithErrorThatThrowsIf(hasVerifyError(), VerifyError.class)
+ .assertFailureWithErrorThatThrowsIf(!hasVerifyError(), NoSuchFieldError.class);
+ }
+
+ @NeverClassInline
+ public enum MyEnum {
+ A(10),
+ B(20);
+
+ public int instanceValue;
+
+ MyEnum(int instanceValue) {
+ this.instanceValue = instanceValue;
+ }
+ }
+
+ public static class Main {
+
+ public static void main(String[] args) throws Exception {
+ set(System.currentTimeMillis() > 0 ? 42 : 0);
+ System.out.println(MyEnum.B.instanceValue);
+ }
+
+ public static void set(int newValue) {
+ MyEnum.B.instanceValue = newValue;
+ }
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/EnumInstanceFieldReferenceOutsideTest.java b/src/test/java/com/android/tools/r8/enumunboxing/EnumInstanceFieldReferenceOutsideTest.java
new file mode 100644
index 0000000..ff0b642
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/enumunboxing/EnumInstanceFieldReferenceOutsideTest.java
@@ -0,0 +1,121 @@
+// Copyright (c) 2022, 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 static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertThrows;
+
+import com.android.tools.r8.CompilationFailedException;
+import com.android.tools.r8.NeverClassInline;
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.ToolHelper.DexVm.Version;
+import java.util.List;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+/**
+ * This is a variant of a regression test for b/247146910 where the instance field on the enum is
+ * unrelated to enum unboxing.
+ */
+@RunWith(Parameterized.class)
+public class EnumInstanceFieldReferenceOutsideTest 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 EnumInstanceFieldReferenceOutsideTest(
+ TestParameters parameters, boolean enumValueOptimization, EnumKeepRules enumKeepRules) {
+ this.parameters = parameters;
+ this.enumValueOptimization = enumValueOptimization;
+ this.enumKeepRules = enumKeepRules;
+ }
+
+ @Test
+ public void testRuntime() throws Exception {
+ testForRuntime(parameters)
+ .addInnerClasses(EnumInstanceFieldReferenceOutsideTest.class)
+ .run(parameters.getRuntime(), Main.class)
+ .assertSuccessWithOutputLines("42");
+ }
+
+ @Test
+ public void testEnumUnboxing() throws Exception {
+ // TODO(b/247146910): Should not throw.
+ assertThrows(
+ CompilationFailedException.class,
+ () ->
+ testForR8(parameters.getBackend())
+ .addInnerClasses(EnumInstanceFieldReferenceOutsideTest.class)
+ .addKeepMainRule(Main.class)
+ .addKeepRules(enumKeepRules.getKeepRules())
+ .addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
+ .addEnumUnboxingInspector(inspector -> inspector.assertUnboxed(MyEnum.class))
+ .addNeverClassInliningAnnotations()
+ .setMinApi(parameters.getApiLevel())
+ .addOptionsModification(options -> options.testing.allowTypeErrors = true)
+ .allowDiagnosticWarningMessages()
+ .compileWithExpectedDiagnostics(
+ diagnostics ->
+ diagnostics.assertErrorMessageThatMatches(
+ containsString(
+ "Enum "
+ + typeName(MyEnum.class)
+ + " has been unboxed but is still in the program"))));
+ }
+
+ private boolean hasVerifyError() {
+ return parameters.getDexRuntimeVersion().isDalvik()
+ || parameters.getDexRuntimeVersion().isNewerThanOrEqual(Version.V12_0_0);
+ }
+
+ @Test
+ public void testEnumUnboxingAllowNotPrunedEnums() throws Exception {
+ testForR8(parameters.getBackend())
+ .addInnerClasses(EnumInstanceFieldReferenceOutsideTest.class)
+ .addKeepMainRule(Main.class)
+ .addKeepRules(enumKeepRules.getKeepRules())
+ .addOptionsModification(
+ opt -> {
+ enableEnumOptions(opt, enumValueOptimization);
+ opt.testing.allowNotPrunedUnboxedEnums = true;
+ })
+ .addEnumUnboxingInspector(inspector -> inspector.assertUnboxed(MyEnum.class))
+ .addNeverClassInliningAnnotations()
+ .setMinApi(parameters.getApiLevel())
+ .addOptionsModification(options -> options.testing.allowTypeErrors = true)
+ .run(parameters.getRuntime(), Main.class)
+ // TODO(b/247146910): Should not fail with runtime error.
+ .assertFailureWithErrorThatThrowsIf(hasVerifyError(), VerifyError.class)
+ .assertFailureWithErrorThatThrowsIf(!hasVerifyError(), NoSuchFieldError.class);
+ }
+
+ @NeverClassInline
+ public enum MyEnum {
+ A,
+ B;
+
+ public int instanceValue = 1;
+ }
+
+ public static class Main {
+
+ public static void main(String[] args) throws Exception {
+ set(System.currentTimeMillis() > 0 ? 42 : 0);
+ System.out.println(MyEnum.B.instanceValue);
+ }
+
+ public static void set(int newValue) {
+ MyEnum.B.instanceValue = newValue;
+ }
+ }
+}
