commit 90f4a569b5c7d6cde8784c9bb0e134ef6913a5d8
author David Srbecky <dsrbecky@google.com> Wed Apr 24 10:32:04 2019 +0100
committer David Srbecky <dsrbecky@google.com> Mon Apr 29 18:26:05 2019 +0000
tree 51ef2e0c047d7c6cb9852ab9e08d43f4d6731992
parent 20758ae71687b6dff0330836aa656fb9d8217d43

jitzygote: JIT native methods on first use.

Compile JNI stub on first use to avoid the expensive generic stub.

(cherry picked from commit c45b5897e65d8713f008732277db2544b9af1e67)

Test: profile calendar
Bug: 119800099
Change-Id: I841c656670d12ce319e3fb1da479643480dba25d
Merged-In: Iaef9d0d528ff34c1636237cdcce6e8639c47c8ed

runtime/jit/jit.cc

diff --git a/runtime/jit/jit.cc b/runtime/jit/jit.cc
index 25c747e..f8d51c6 100644
--- a/runtime/jit/jit.cc
+++ b/runtime/jit/jit.cc
@@ -815,6 +815,13 @@
     }
   }
   if (UseJitCompilation()) {
+    if (old_count == 0 &&
+        method->IsNative() &&
+        Runtime::Current()->IsUsingApexBootImageLocation()) {
+      // jitzygote: Compile JNI stub on first use to avoid the expensive generic stub.
+      CompileMethod(method, self, /* baseline= */ false, /* osr= */ false);
+      return true;
+    }
     if (old_count < HotMethodThreshold() && new_count >= HotMethodThreshold()) {
       if (!code_cache_->ContainsPc(method->GetEntryPointFromQuickCompiledCode())) {
         DCHECK(thread_pool_ != nullptr);

runtime/jit/jit_code_cache.cc

diff --git a/runtime/jit/jit_code_cache.cc b/runtime/jit/jit_code_cache.cc
index c22f4e3..fee5bec 100644
--- a/runtime/jit/jit_code_cache.cc
+++ b/runtime/jit/jit_code_cache.cc
@@ -2062,8 +2062,9 @@
         }
       }
       if (collection_in_progress_) {
-        CHECK(!IsInZygoteExecSpace(data->GetCode()));
-        GetLiveBitmap()->AtomicTestAndSet(FromCodeToAllocation(data->GetCode()));
+        if (!IsInZygoteExecSpace(data->GetCode())) {
+          GetLiveBitmap()->AtomicTestAndSet(FromCodeToAllocation(data->GetCode()));
+        }
       }
     }
     return new_compilation;