commit a96917a6983a5abbe973255a3846fda549fb1657
author Nicolas Geoffray <ngeoffray@google.com> Tue Mar 01 22:18:02 2016 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Tue Mar 01 22:18:02 2016 +0000
tree aa03a2a6d0f70faa20f3579458abde24f71abb04
parent 7273a5d045d3ceb3ff011ad65765356b69b155e8

Revert "Use the interpreter as a heartbeat for the JIT."

Hits a DCHECK testing libcore.
    art F 11973 12675 art/runtime/jit/jit_code_cache.cc:644] Check failed: it.second->GetProfilingInfo(sizeof(void*)) != nullptr 


Bug: 27398183
Bug: 23128949
Bug: 26846185

This reverts commit 7273a5d045d3ceb3ff011ad65765356b69b155e8.

Change-Id: I6614a82e775ea71aa16f041313f67546db41eac8

runtime/interpreter/interpreter.cc

diff --git a/runtime/interpreter/interpreter.cc b/runtime/interpreter/interpreter.cc
index 9808e22..a595d33 100644
--- a/runtime/interpreter/interpreter.cc
+++ b/runtime/interpreter/interpreter.cc
@@ -295,7 +295,9 @@
     }
 
     jit::Jit* jit = Runtime::Current()->GetJit();
-    if (jit != nullptr && jit->CanInvokeCompiledCode(method)) {
+    if (UNLIKELY(jit != nullptr &&
+                 jit->JitAtFirstUse() &&
+                 jit->GetCodeCache()->ContainsMethod(method))) {
       JValue result;
 
       // Pop the shadow frame before calling into compiled code.