Relax an assert in AssertPcIsWithinQuickCode()
Skip the case when pc is jitted code.
Bug: 36467228
Test: m -j20 test-art-host-run-test
Test: test/run-test --host --prebuild --jit --no-relocate --runtime-option -Xcheck:jni --no-image --64 597-deopt-new-string
Change-Id: Ie9c325e2eaf7c81f1769abacc2d2615b1c1c97cb
diff --git a/runtime/stack.cc b/runtime/stack.cc
index 5c6eead..4268ba3 100644
--- a/runtime/stack.cc
+++ b/runtime/stack.cc
@@ -648,6 +648,12 @@
return;
}
+ Runtime* runtime = Runtime::Current();
+ if (runtime->UseJitCompilation() &&
+ runtime->GetJit()->GetCodeCache()->ContainsPc(reinterpret_cast<const void*>(pc))) {
+ return;
+ }
+
const void* code = method->GetEntryPointFromQuickCompiledCode();
if (code == GetQuickInstrumentationEntryPoint() || code == GetInvokeObsoleteMethodStub()) {
return;
@@ -659,9 +665,6 @@
return;
}
- // If we are the JIT then we may have just compiled the method after the
- // IsQuickToInterpreterBridge check.
- Runtime* runtime = Runtime::Current();
if (runtime->UseJitCompilation() && runtime->GetJit()->GetCodeCache()->ContainsPc(code)) {
return;
}