Revert "Don't use nterp when instrumentation is active"
This reverts commit c7df8d12ea3228af445fb821c3cac13ca85a9e5f.
Reason for revert: Time out on CTS test:
https://buganizer.corp.google.com/issues/238090841
Change-Id: Iab15e11c10f023193f7f519c34254f1caf8d9ea8
diff --git a/runtime/interpreter/mterp/nterp.cc b/runtime/interpreter/mterp/nterp.cc
index 22c91a3..d70a846 100644
--- a/runtime/interpreter/mterp/nterp.cc
+++ b/runtime/interpreter/mterp/nterp.cc
@@ -45,11 +45,9 @@
// parts of the runtime (like instrumentation) make assumption on an
// interpreter-only runtime to always be in a switch-like interpreter.
return IsNterpSupported() &&
- !runtime->IsJavaDebuggable() &&
- !instr->AreExitStubsInstalled() &&
!instr->InterpretOnly() &&
!runtime->IsAotCompiler() &&
- !instr->NeedsSlowInterpreterForListeners() &&
+ !runtime->GetInstrumentation()->NeedsSlowInterpreterForListeners() &&
// An async exception has been thrown. We need to go to the switch interpreter. nterp doesn't
// know how to deal with these so we could end up never dealing with it if we are in an
// infinite loop.