commit 7c8734d1ec8841da7b99d0c09025d2ac5497a62e
author Clément Béra <clementbera@google.com> Mon Nov 30 19:10:13 2020 +0000
committer Clément Béra <clementbera@google.com> Mon Nov 30 19:10:13 2020 +0000
tree f2c6bd0a8f9260d1e6959a7421138f2ecf6b0a87
parent 5173a636054abad72e98821cdc405012fe3deaa2

Disable enum unboxing on enum subtypes

Change-Id: I6d4c321e424fc4730f97bc5df498b78c7662997b

src/main/java/com/android/tools/r8/ir/optimize/enums/EnumUnboxingCandidateAnalysis.java

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 fd9b279..40b0c86 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
@@ -53,7 +53,7 @@
     if (!clazz.isEnum()) {
       return false;
     }
-    if (!clazz.isEffectivelyFinal(appView)) {
+    if (clazz.superType != factory.enumType || !clazz.isEffectivelyFinal(appView)) {
       enumUnboxer.reportFailure(clazz.type, Reason.SUBTYPES);
       return false;
     }