commit bd0ac86f6889e7540853df80b5b499a2151f2a97
author Nicolas Geoffray <ngeoffray@google.com> Wed Dec 18 08:16:35 2019 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Wed Dec 18 08:22:03 2019 +0000
tree e8e391ca1f04308f58607e5c97adae9a50326c81
parent 00391824f4ee89f9fbed178a1ee32bc29fa77b3b

Ensure Nterp is also supported in CanRuntimeUseNterp.

Bug: 112676029
Test: test-art-host-gtest
Change-Id: Ib48724d9c985a970ec023b99282a3b3a123afaec

runtime/interpreter/mterp/nterp.cc

diff --git a/runtime/interpreter/mterp/nterp.cc b/runtime/interpreter/mterp/nterp.cc
index 1e52492..c14a5ff 100644
--- a/runtime/interpreter/mterp/nterp.cc
+++ b/runtime/interpreter/mterp/nterp.cc
@@ -38,7 +38,7 @@
 
 bool CanRuntimeUseNterp() REQUIRES_SHARED(Locks::mutator_lock_) {
   // Nterp has the same restrictions as Mterp.
-  return CanUseMterp();
+  return IsNterpSupported() && CanUseMterp();
 }
 
 bool CanMethodUseNterp(ArtMethod* method) REQUIRES_SHARED(Locks::mutator_lock_) {