commit 06ef9aa6a562a3a1f7c1f9b91aadda5018f8ba86
author David Srbecky <dsrbecky@google.com> Fri Oct 19 14:47:23 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 19 14:47:23 2018 +0000
tree ab268a10378a8af6c403172ea465cdb47994bcdc
parent 4f570a43146c1456071f2ffe6590ab96e723051a
parent 6c444480dc55d4d0e3a99e441ce0804663bf05b4

Merge "Count transitions from interpreter to intrinsic."

runtime/interpreter/interpreter_common.h

diff --git a/runtime/interpreter/interpreter_common.h b/runtime/interpreter/interpreter_common.h
index 3c5abe1..26bfba9 100644
--- a/runtime/interpreter/interpreter_common.h
+++ b/runtime/interpreter/interpreter_common.h
@@ -182,11 +182,12 @@
   }
 
   if (is_mterp && !is_range && called_method->IsIntrinsic()) {
-    if (type == kDirect || type == kStatic || type == kVirtual) {
-      if (MterpHandleIntrinsic(&shadow_frame, called_method, inst, inst_data,
-                               shadow_frame.GetResultRegister())) {
-        return !self->IsExceptionPending();
+    if (MterpHandleIntrinsic(&shadow_frame, called_method, inst, inst_data,
+                             shadow_frame.GetResultRegister())) {
+      if (jit != nullptr && sf_method != nullptr) {
+        jit->NotifyInterpreterToCompiledCodeTransition(self, sf_method);
       }
+      return !self->IsExceptionPending();
     }
   }