Fix 616-cha-miranda test for speed-profile.
Check whether `Main.testOverride()` is AOT-compiled
instead of checking the caller.
Test: testrunner.py --host -t 616-cha-miranda
Test: ART_HEAP_POISONING=true testrunner.py --host -t 616-cha-miranda
Bug: 204740802
Change-Id: Iba51097847471d7cd776914a0123e6286b0b7bf2
diff --git a/test/616-cha-miranda/src/Main.java b/test/616-cha-miranda/src/Main.java
index 640b97a..c125758 100644
--- a/test/616-cha-miranda/src/Main.java
+++ b/test/616-cha-miranda/src/Main.java
@@ -110,9 +110,7 @@
public static void main(String[] args) {
System.loadLibrary(args[0]);
- if (isInterpreted()) {
- sIsOptimizing = false;
- }
+ sIsOptimizing = isAotCompiled(Main.class, "testOverride");
sHasJIT = hasJit();
// sMain1 is an instance of Main1. Main2 hasn't bee loaded yet.
@@ -142,6 +140,7 @@
}
private static native boolean hasJit();
+ private native static boolean isAotCompiled(Class<?> cls, String methodName);
private static native void ensureJitCompiled(Class<?> itf, String method_name);
private static native void assertIsInterpreted();
private static native void assertIsManaged();