commit 14bfeddf2e434954f0ca36687ac0fc5dc6412bd3
author Andreas Gampe <agampe@google.com> Tue Feb 26 22:16:07 2019 +0000
committer Andreas Gampe <agampe@google.com> Tue Feb 26 23:59:26 2019 +0000
tree 59b23768c4d886e99bd81968e0eaf26ff2160a37
parent e55ea985ab4f77ca9557e33a2d29dc1a1f0ac078

Revert "Add support for booting with a boot classpath not fully AOTed."

This reverts commit 7417ce97c4dcabbd7423d46ff9b7cdaf95c1e0f9.

Reason for revert: Breaks debug mode

Bug: 119800099
Bug: 126239181
Change-Id: I2d4a79f957a020cc6404a130536a416daebc94e3

compiler/optimizing/inliner.cc

diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc
index 18784da..96d6d2a 100644
--- a/compiler/optimizing/inliner.cc
+++ b/compiler/optimizing/inliner.cc
@@ -589,12 +589,9 @@
 
   StackHandleScope<1> hs(Thread::Current());
   Handle<mirror::ObjectArray<mirror::Class>> inline_cache;
-  // The Zygote JIT compiles based on a profile, so we shouldn't use runtime inline caches
-  // for it.
-  InlineCacheType inline_cache_type =
-      (Runtime::Current()->IsAotCompiler() || Runtime::Current()->IsZygote())
-          ? GetInlineCacheAOT(caller_dex_file, invoke_instruction, &hs, &inline_cache)
-          : GetInlineCacheJIT(invoke_instruction, &hs, &inline_cache);
+  InlineCacheType inline_cache_type = Runtime::Current()->IsAotCompiler()
+      ? GetInlineCacheAOT(caller_dex_file, invoke_instruction, &hs, &inline_cache)
+      : GetInlineCacheJIT(invoke_instruction, &hs, &inline_cache);
 
   switch (inline_cache_type) {
     case kInlineCacheNoData: {