commit 4a0c7c2d7ef427d852b58708f3ed4d3f8bfdee70
author Ian Zerny <zerny@google.com> Fri Jul 10 07:19:31 2020 +0200
committer Ian Zerny <zerny@google.com> Fri Jul 10 07:19:31 2020 +0200
tree b2a4ec787d281ba1ec1b6734e3f5d6f8b944958f
parent 8f45743fade7a484f059fff72f74ab2737e0fa2f

Fix enum invoke identification in R8InliningTest.

Change-Id: I94e75832b8f563b6fbdb2e819739d906ced59007

src/test/java/com/android/tools/r8/ir/optimize/R8InliningTest.java

diff --git a/src/test/java/com/android/tools/r8/ir/optimize/R8InliningTest.java b/src/test/java/com/android/tools/r8/ir/optimize/R8InliningTest.java
index 75c45d1..1d7f782 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/R8InliningTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/R8InliningTest.java
@@ -18,6 +18,7 @@
 import com.android.tools.r8.origin.Origin;
 import com.android.tools.r8.utils.BooleanUtils;
 import com.android.tools.r8.utils.FileUtils;
+import com.android.tools.r8.utils.InternalOptions;
 import com.android.tools.r8.utils.ZipUtils;
 import com.android.tools.r8.utils.codeinspector.ClassSubject;
 import com.android.tools.r8.utils.codeinspector.CodeInspector;
@@ -369,16 +370,27 @@
       InstructionSubject instruction = iterator.next();
       if (instruction.isInstanceGet()) {
         ++instanceGetCount;
-      } else if (instruction.isInvoke()
-          && !instruction
-              .getMethod()
-              .name
-              .toString()
-              .startsWith(EnumUnboxingRewriter.ENUM_UNBOXING_UTILITY_METHOD_PREFIX)) {
+      } else if (instruction.isInvoke() && !isEnumInvoke(instruction)) {
         ++invokeCount;
       }
     }
     assertEquals(1, instanceGetCount);
-    assertEquals(BooleanUtils.intValue(parameters.isCfRuntime()), invokeCount);
+    assertEquals(0, invokeCount);
+  }
+
+  private boolean isEnumInvoke(InstructionSubject instruction) {
+    InternalOptions defaults = new InternalOptions();
+    if (parameters.isDexRuntime() && defaults.enableEnumUnboxing) {
+      return instruction
+          .getMethod()
+          .name
+          .toString()
+          .startsWith(EnumUnboxingRewriter.ENUM_UNBOXING_UTILITY_METHOD_PREFIX);
+    } else {
+      return ((InvokeInstructionSubject) instruction)
+          .holder()
+          .toString()
+          .contains("java.lang.Enum");
+    }
   }
 }