Disable on stack replacement for now.
Change-Id: I7b57252d4872e8c280e95de4ad4ff55a3ca22685
diff --git a/runtime/jit/jit.cc b/runtime/jit/jit.cc
index fcfa457..31c278e 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);
@@ -278,6 +280,10 @@
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 b3560b6..7c71ce3 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -446,7 +446,9 @@
# 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.
+# Disable 570 while investigating OSR issues.
TEST_ART_BROKEN_JIT_RUN_TESTS := \
+ 570-checker-osr \
137-cfi
ifneq (,$(filter jit,$(COMPILER_TYPES)))