Fix Keep rules on enum subtypes
Bug: b/271385332
Change-Id: I5d1522ca6af2d07a7c8410486e141db73efecb28
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/enums/EnumUnboxingCandidateAnalysis.java b/src/main/java/com/android/tools/r8/ir/optimize/enums/EnumUnboxingCandidateAnalysis.java
index e12cdc8..c9e841f 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/enums/EnumUnboxingCandidateAnalysis.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/enums/EnumUnboxingCandidateAnalysis.java
@@ -60,12 +60,12 @@
}
}
removeIneligibleCandidates();
+ setEnumSubclassesOnCandidates();
removeEnumsInAnnotations();
removePinnedCandidates();
if (appView.options().protoShrinking().isProtoShrinkingEnabled()) {
enumToUnboxCandidates.removeCandidate(appView.protoShrinker().references.methodToInvokeType);
}
- setEnumSubclassesOnCandidates();
assert enumToUnboxCandidates.verifyAllSubtypesAreSet();
return enumToUnboxCandidates;
}
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/enums/EnumUnboxingCandidateInfoCollection.java b/src/main/java/com/android/tools/r8/ir/optimize/enums/EnumUnboxingCandidateInfoCollection.java
index 3c2fc90..70e73dc 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/enums/EnumUnboxingCandidateInfoCollection.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/enums/EnumUnboxingCandidateInfoCollection.java
@@ -67,11 +67,11 @@
}
public void removeCandidate(DexType enumType) {
- enumTypeToInfo.remove(enumType);
+ enumTypeToInfo.remove(subEnumToSuperEnumMap.getOrDefault(enumType, enumType));
}
public boolean isCandidate(DexType enumType) {
- return enumTypeToInfo.containsKey(enumType);
+ return enumTypeToInfo.containsKey(subEnumToSuperEnumMap.getOrDefault(enumType, enumType));
}
public boolean isEmpty() {
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/enummerging/BasicEnumMergingKeepSubtypeTest.java b/src/test/java/com/android/tools/r8/enumunboxing/enummerging/BasicEnumMergingKeepSubtypeTest.java
new file mode 100644
index 0000000..4f1d44e
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/enumunboxing/enummerging/BasicEnumMergingKeepSubtypeTest.java
@@ -0,0 +1,80 @@
+// 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.enummerging;
+
+import static org.junit.Assert.assertTrue;
+
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.enumunboxing.EnumUnboxingTestBase;
+import com.android.tools.r8.utils.codeinspector.CodeInspector;
+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 BasicEnumMergingKeepSubtypeTest 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();
+ }
+
+ private static final String SUBTYPE_NAME = EnumWithVirtualOverride.class.getTypeName() + "$1";
+
+ public BasicEnumMergingKeepSubtypeTest(
+ 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())
+ .addKeepMainRule(Main.class)
+ .addKeepRules("-keep class " + SUBTYPE_NAME + " { public void method(); }")
+ .addKeepRules(enumKeepRules.getKeepRules())
+ .addOptionsModification(opt -> opt.testing.enableEnumWithSubtypesUnboxing = true)
+ .addEnumUnboxingInspector(
+ inspector -> inspector.assertNotUnboxed(EnumWithVirtualOverride.class))
+ .addOptionsModification(opt -> enableEnumOptions(opt, enumValueOptimization))
+ .setMinApi(parameters)
+ .compile()
+ .inspect(this::methodKept)
+ .run(parameters.getRuntime(), Main.class)
+ .assertSuccessWithOutputLines("a", "B");
+ }
+
+ private void methodKept(CodeInspector inspector) {
+ assertTrue(inspector.clazz(SUBTYPE_NAME).uniqueMethodWithFinalName("method").isPresent());
+ }
+
+ enum EnumWithVirtualOverride {
+ A {
+ public void method() {
+ System.out.println("a");
+ }
+ },
+ B;
+
+ public void method() {
+ System.out.println(name());
+ }
+ }
+
+ static class Main {
+
+ public static void main(String[] args) {
+ EnumWithVirtualOverride.A.method();
+ EnumWithVirtualOverride.B.method();
+ }
+ }
+}
