From 08490b84048a0267694268185441b70cfa090185 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Tue, 18 Jul 2017 12:58:10 +0100 Subject: Only honor $inline$ in AOT. The state of classes is undeterministic when JITting. Test: test.py Change-Id: I05325efe325bb4f7759d7af7cd65d362e6945c57 --- compiler/optimizing/inliner.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'compiler/optimizing/inliner.cc') diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc index 142c95780e..18390cc4d4 100644 --- a/compiler/optimizing/inliner.cc +++ b/compiler/optimizing/inliner.cc @@ -146,7 +146,10 @@ void HInliner::Run() { // that this method is actually inlined; // - if a method's name contains the substring "$noinline$", do not // inline that method. - const bool honor_inlining_directives = IsCompilingWithCoreImage(); + // We limit this to AOT compilation, as the JIT may or may not inline + // depending on the state of classes at runtime. + const bool honor_inlining_directives = + IsCompilingWithCoreImage() && Runtime::Current()->IsAotCompiler(); // Keep a copy of all blocks when starting the visit. ArenaVector blocks = graph_->GetReversePostOrder(); -- cgit v1.2.3-59-g8ed1b