Don't disable nterp even if non-standard exits might be requested
For pop frame and force early return events from JVMTI we use
non-standard exits which are supported only in the slow interpreter. We
already have support to deoptimize when the actual event happens if the
top two frames aren't running in the slow interpreter. So it isn't
required to disable nterp as a whole just when the feature is enabled.
Test: art/test.py
Bug: 206029744
Change-Id: I4af2fd271f835157d7c867bd1e4f2f1f0c1e0929
diff --git a/runtime/interpreter/mterp/nterp.cc b/runtime/interpreter/mterp/nterp.cc
index 670ae1b..7719b5f 100644
--- a/runtime/interpreter/mterp/nterp.cc
+++ b/runtime/interpreter/mterp/nterp.cc
@@ -47,9 +47,6 @@
!instr->InterpretOnly() &&
!runtime->IsAotCompiler() &&
!runtime->GetInstrumentation()->IsActive() &&
- // nterp only knows how to deal with the normal exits. It cannot handle any of the
- // non-standard force-returns.
- !runtime->AreNonStandardExitsEnabled() &&
// 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.