commit 4d7e1a8251c991828121043982d8b4bf0a9dd027
author Nicolas Geoffray <ngeoffray@google.com> Sun Jan 26 19:57:02 2020 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Mon Jan 27 13:41:47 2020 +0000
tree 510a0f306472254d580a3442b697dbf601de1e3e
parent c1cd1330c65e8b9b13bcd93bd9634eed6453c5dc

nterp: Don't compile baseline if a process cannot allocate profiling infos.

The zygote cannot allocate profiling infos. Found in b/148219586

Bug:148219586
Test: Use libartd on an x64 emulator
Test: gcar_emu_x86_64-userdebug boots.
Change-Id: Ic8c12c924dfc93498198a6619724f0015f674944

runtime/jit/jit.cc

diff --git a/runtime/jit/jit.cc b/runtime/jit/jit.cc
index 73b9f8b..d45b113 100644
--- a/runtime/jit/jit.cc
+++ b/runtime/jit/jit.cc
@@ -1760,9 +1760,14 @@
         self, new JitCompileTask(method, JitCompileTask::TaskKind::kCompileOsr));
     return;
   }
-  ProfilingInfo::Create(self, method, /* retry_allocation= */ false);
-  thread_pool_->AddTask(
-      self, new JitCompileTask(method, JitCompileTask::TaskKind::kCompileBaseline));
+  if (GetCodeCache()->CanAllocateProfilingInfo()) {
+    ProfilingInfo::Create(self, method, /* retry_allocation= */ false);
+    thread_pool_->AddTask(
+        self, new JitCompileTask(method, JitCompileTask::TaskKind::kCompileBaseline));
+  } else {
+    thread_pool_->AddTask(
+        self, new JitCompileTask(method, JitCompileTask::TaskKind::kCompile));
+  }
 }
 
 }  // namespace jit