Check for deoptimized method only when there are method entry callbacks
We always update entrypoint of the method to point to InterpreterBridge
if the method is deoptimized. So, we don't need to check if the method
is deoptimized when there are no method entry callbacks. Method entry
callbacks could set new breakpoints and hence we need to check if the
metnod is deoptimized after running any method entry listeners.
Bug: 253232638
Test: art/test.py
Change-Id: Iadb25a96307646ad7119162d56038729930767cb
diff --git a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
index 128d2e6..1abdd2b 100644
--- a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
@@ -2668,12 +2668,18 @@
extern "C" void artMethodEntryHook(ArtMethod* method, Thread* self, ArtMethod** sp ATTRIBUTE_UNUSED)
REQUIRES_SHARED(Locks::mutator_lock_) {
instrumentation::Instrumentation* instr = Runtime::Current()->GetInstrumentation();
- instr->MethodEnterEvent(self, method);
- if (instr->IsDeoptimized(method)) {
- // Instrumentation can request deoptimizing only a particular method (for
- // ex: when there are break points on the method). In such cases deoptimize
- // only this method. FullFrame deoptimizations are handled on method exits.
- artDeoptimizeFromCompiledCode(DeoptimizationKind::kDebugging, self);
+ if (instr->HasMethodEntryListeners()) {
+ instr->MethodEnterEvent(self, method);
+ // MethodEnter callback could have requested a deopt for ex: by setting a breakpoint, so
+ // check if we need a deopt here.
+ if (instr->IsDeoptimized(method)) {
+ // Instrumentation can request deoptimizing only a particular method (for ex: when
+ // there are break points on the method). In such cases deoptimize only this method.
+ // FullFrame deoptimizations are handled on method exits.
+ artDeoptimizeFromCompiledCode(DeoptimizationKind::kDebugging, self);
+ }
+ } else {
+ DCHECK(!instr->IsDeoptimized(method));
}
}
