commit bb4898411d496aad044843ffebd8f1096bf0a291
author Christoffer Quist Adamsen <christofferqa@google.com> Thu Oct 08 13:32:44 2020 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Thu Oct 08 11:58:36 2020 +0000
tree 346bc7e6cf086a9e8bd9c1d5e1a0cbe5f3c5e532
parent 83662a0b05285ccdcb6181c302152ec5677fd948

Fix use of createInstanceInitializerWithFreshProto

Change-Id: Icf631ed32da56c29c52be423acdb12fd77170dc8

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

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/enums/EnumUnboxingTreeFixer.java b/src/main/java/com/android/tools/r8/ir/optimize/enums/EnumUnboxingTreeFixer.java
index df641af..4df9c8d 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/enums/EnumUnboxingTreeFixer.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/enums/EnumUnboxingTreeFixer.java
@@ -144,7 +144,7 @@
   private DexMethod ensureUniqueMethod(DexEncodedMethod encodedMethod, DexMethod newMethod) {
     DexClass holder = appView.definitionFor(encodedMethod.holder());
     assert holder != null;
-    if (encodedMethod.isInstanceInitializer()) {
+    if (newMethod.isInstanceInitializer(appView.dexItemFactory())) {
       newMethod =
           factory.createInstanceInitializerWithFreshProto(
               newMethod,