diff options
Diffstat (limited to 'compiler/optimizing')
| -rw-r--r-- | compiler/optimizing/inliner.cc | 5 | ||||
| -rw-r--r-- | compiler/optimizing/instruction_simplifier_arm.cc | 4 |
2 files changed, 6 insertions, 3 deletions
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<HBasicBlock*> blocks = graph_->GetReversePostOrder(); diff --git a/compiler/optimizing/instruction_simplifier_arm.cc b/compiler/optimizing/instruction_simplifier_arm.cc index 3fc7c50bb1..fe22595258 100644 --- a/compiler/optimizing/instruction_simplifier_arm.cc +++ b/compiler/optimizing/instruction_simplifier_arm.cc @@ -147,8 +147,8 @@ void InstructionSimplifierArmVisitor::VisitArrayGet(HArrayGet* instruction) { Primitive::Type type = instruction->GetType(); // TODO: Implement reading (length + compression) for String compression feature from - // negative offset (count_offset - data_offset). Thumb2Assembler does not support T4 - // encoding of "LDR (immediate)" at the moment. + // negative offset (count_offset - data_offset). Thumb2Assembler (now removed) did + // not support T4 encoding of "LDR (immediate)", but ArmVIXLMacroAssembler might. // Don't move array pointer if it is charAt because we need to take the count first. if (mirror::kUseStringCompression && instruction->IsStringCharAt()) { return; |