diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/623-checker-loop-regressions/expected.txt | 1 | ||||
| -rw-r--r-- | test/623-checker-loop-regressions/src/Main.java | 7 | ||||
| -rw-r--r-- | test/983-source-transform-verify/source_transform.cc | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/test/623-checker-loop-regressions/expected.txt b/test/623-checker-loop-regressions/expected.txt index b0aad4deb5..805857dc65 100644 --- a/test/623-checker-loop-regressions/expected.txt +++ b/test/623-checker-loop-regressions/expected.txt @@ -1 +1,2 @@ +JNI_OnLoad called passed diff --git a/test/623-checker-loop-regressions/src/Main.java b/test/623-checker-loop-regressions/src/Main.java index 29f3817afb..4e2b241fd7 100644 --- a/test/623-checker-loop-regressions/src/Main.java +++ b/test/623-checker-loop-regressions/src/Main.java @@ -19,6 +19,8 @@ */ public class Main { + private static native void ensureJitCompiled(Class<?> cls, String methodName); + /// CHECK-START: int Main.earlyExitFirst(int) loop_optimization (before) /// CHECK-DAG: Phi loop:<<Loop:B\d+>> outer_loop:none /// CHECK-DAG: Phi loop:<<Loop>> outer_loop:none @@ -583,6 +585,8 @@ public class Main { } public static void main(String[] args) { + System.loadLibrary(args[0]); + expectEquals(10, earlyExitFirst(-1)); for (int i = 0; i <= 10; i++) { expectEquals(i, earlyExitFirst(i)); @@ -746,6 +750,9 @@ public class Main { expectEquals(153, doNotMoveSIMD()); + // This test exposed SIMDization issues on x86 and x86_64 + // so we make sure the test runs with JIT enabled. + ensureJitCompiled(Main.class, "reduction32Values"); { int[] a1 = new int[100]; int[] a2 = new int[100]; diff --git a/test/983-source-transform-verify/source_transform.cc b/test/983-source-transform-verify/source_transform.cc index 55dc603c4f..e9cb35e944 100644 --- a/test/983-source-transform-verify/source_transform.cc +++ b/test/983-source-transform-verify/source_transform.cc @@ -90,7 +90,7 @@ void JNICALL CheckDexFileHook(jvmtiEnv* jvmti_env ATTRIBUTE_UNUSED, continue; } for (const DexInstructionPcPair& pair : - art::CodeItemInstructionAccessor(dex.get(), it.GetMethodCodeItem())) { + art::CodeItemInstructionAccessor(*dex, it.GetMethodCodeItem())) { const Instruction& inst = pair.Inst(); int forbiden_flags = (Instruction::kVerifyError | Instruction::kVerifyRuntimeOnly); if (inst.Opcode() == Instruction::RETURN_VOID_NO_BARRIER || |