diff options
| -rw-r--r-- | runtime/jit/jit.cc | 6 | ||||
| -rw-r--r-- | test/Android.run-test.mk | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/runtime/jit/jit.cc b/runtime/jit/jit.cc index 54b65e6674..e38a684824 100644 --- a/runtime/jit/jit.cc +++ b/runtime/jit/jit.cc @@ -36,6 +36,8 @@ namespace art { namespace jit { +static constexpr bool kEnableOnStackReplacement = false; + JitOptions* JitOptions::CreateFromRuntimeArguments(const RuntimeArgumentMap& options) { auto* jit_options = new JitOptions; jit_options->use_jit_ = options.GetOrDefault(RuntimeArgumentMap::UseJIT); @@ -274,6 +276,10 @@ bool Jit::MaybeDoOnStackReplacement(Thread* thread, uint32_t dex_pc, int32_t dex_pc_offset, JValue* result) { + if (!kEnableOnStackReplacement) { + return false; + } + Jit* jit = Runtime::Current()->GetJit(); if (jit == nullptr) { return false; diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk index e6ffd2ed9b..f5ee87e8ae 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -434,7 +434,9 @@ TEST_ART_BROKEN_INTERPRETER_RUN_TESTS := # Known broken tests for the JIT. # CFI unwinding expects managed frames, and the test does not iterate enough to even compile. JIT # also uses Generic JNI instead of the JNI compiler. +# 570 is disabled while investigating osr flakiness. TEST_ART_BROKEN_JIT_RUN_TESTS := \ + 570-checker-osr \ 137-cfi ifneq (,$(filter jit,$(COMPILER_TYPES))) |