commit 170922973b0d57419cdc927a94bbbb36413cb171
author Clément Béra <clementbera@google.com> Fri May 15 06:45:22 2020 +0000
committer Clément Béra <clementbera@google.com> Fri May 15 07:02:17 2020 +0000
tree 28d460c79022d8120059aab4867da44f2768e434
parent 8f55aa495e8fb14235ea596a0e152af19d673a2f

Disable enum unboxing in compilation-steps

Change-Id: Ieafc3ddd9b1a89d6aa2b78cab6ecfdb67f4ee11f

src/main/java/com/android/tools/r8/R8.java

diff --git a/src/main/java/com/android/tools/r8/R8.java b/src/main/java/com/android/tools/r8/R8.java
index 9a0e76a..555b71f 100644
--- a/src/main/java/com/android/tools/r8/R8.java
+++ b/src/main/java/com/android/tools/r8/R8.java
@@ -285,7 +285,13 @@
       InterfaceMethodRewriter.checkForAssumedLibraryTypes(appView.appInfo(), options);
       BackportedMethodRewriter.registerAssumedLibraryTypes(options);
       if (options.enableEnumUnboxing) {
-        EnumUnboxingCfMethods.registerSynthesizedCodeReferences(options.itemFactory);
+        if (application.definitionFor(options.itemFactory.enumUnboxingUtilityType) != null) {
+          // The enum unboxing utility class can be created only during cf to dex compilation.
+          // If this is true, we are recompiling the dex application with R8 (compilation-steps).
+          options.enableEnumUnboxing = false;
+        } else {
+          EnumUnboxingCfMethods.registerSynthesizedCodeReferences(options.itemFactory);
+        }
       }
 
       List<ProguardConfigurationRule> synthesizedProguardRules = new ArrayList<>();