Handle nterp in IsForcedInterpreterNeededForUpcallImpl.

Nterp is an interpreter but can have exit stubs.

Test: 1916-get-set-current-frame
Bug: 112676029
Change-Id: Ia6f175e0badc572c2f4a03cff99f70bf6649a535

1 files changed, 1 insertions, 7 deletions

diff --git a/runtime/debugger.cc b/runtime/debugger.cc
index b28868fb7b..95361b5b82 100644
--- a/runtime/debugger.cc
+++ b/runtime/debugger.cc
@@ -3573,12 +3573,6 @@ bool Dbg::IsForcedInterpreterNeededForUpcallImpl(Thread* thread, ArtMethod* m) {
   if (m == nullptr) {
     return false;
   }
-  instrumentation::Instrumentation* const instrumentation =
-      Runtime::Current()->GetInstrumentation();
-  // If we are in interpreter only mode, then we don't have to force interpreter.
-  if (instrumentation->InterpretOnly()) {
-    return false;
-  }
   // We can only interpret pure Java method.
   if (m->IsNative() || m->IsProxyMethod()) {
     return false;
@@ -3599,7 +3593,7 @@ bool Dbg::IsForcedInterpreterNeededForUpcallImpl(Thread* thread, ArtMethod* m) {
     return true;
   }
   // We have to require stack deoptimization if the upcall is deoptimized.
-  return instrumentation->IsDeoptimized(m);
+  return Runtime::Current()->GetInstrumentation()->IsDeoptimized(m);
 }
 
 // Do we need to deoptimize the stack to handle an exception?