commit 493398b661a715a4f253fc8c20fa86cf21c75d71
author Clément Béra <clementbera@google.com> Thu Apr 27 13:30:36 2023 +0200
committer Clément Béra <clementbera@google.com> Thu Apr 27 17:50:17 2023 +0000
tree face2d0c4d55ddffef0378ae70524ed361761e88
parent 1aad0e2a69cf4861b6c535961c871f849deef767

Remove legacy code

Fixes: b/275475436
Change-Id: Ia4de3624ffb6e116d87634188c58150d933dfc90

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 c9e841f..4531523 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
@@ -86,18 +86,13 @@
   }
 
   private void analyzeEnum(GraphLens graphLensForPrimaryOptimizationPass, DexProgramClass clazz) {
-    if (!appView.options().testing.enableEnumWithSubtypesUnboxing) {
-      if (legacyIsEnumUnboxingCandidate(clazz)) {
-        enumToUnboxCandidates.addCandidate(appView, clazz, graphLensForPrimaryOptimizationPass);
-      }
-      return;
-    }
     if (clazz.superType == factory.enumType) {
       if (isSuperEnumUnboxingCandidate(clazz)) {
         enumToUnboxCandidates.addCandidate(appView, clazz, graphLensForPrimaryOptimizationPass);
       }
     } else {
-      if (isSubEnumUnboxingCandidate(clazz)) {
+      if (isSubEnumUnboxingCandidate(clazz)
+          && appView.options().testing.enableEnumWithSubtypesUnboxing) {
         enumSubclasses
             .computeIfAbsent(clazz.superType, ignoreKey(Sets::newIdentityHashSet))
             .add(clazz);
@@ -135,23 +130,6 @@
     return result;
   }
 
-  private boolean legacyIsEnumUnboxingCandidate(DexProgramClass clazz) {
-    assert clazz.isEnum();
-
-    // This is used in debug mode, where we don't do quick returns to log all the reasons an enum
-    // is not unboxed.
-    boolean result = true;
-
-    if (!clazz.isEffectivelyFinal(appView)) {
-      if (!enumUnboxer.reportFailure(clazz, Reason.SUBTYPES)) {
-        return false;
-      }
-      result = false;
-    }
-
-    return isSuperEnumUnboxingCandidate(clazz) && result;
-  }
-
   private boolean isSuperEnumUnboxingCandidate(DexProgramClass clazz) {
     assert clazz.isEnum();