diff options
Diffstat (limited to 'compiler/optimizing/inliner.cc')
| -rw-r--r-- | compiler/optimizing/inliner.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc index 3b681c13a5..8674e727bb 100644 --- a/compiler/optimizing/inliner.cc +++ b/compiler/optimizing/inliner.cc @@ -783,7 +783,7 @@ void HInliner::AddCHAGuard(HInstruction* invoke_instruction, HInstruction* compare = new (graph_->GetArena()) HNotEqual( deopt_flag, graph_->GetIntConstant(0, dex_pc)); HInstruction* deopt = new (graph_->GetArena()) HDeoptimize( - graph_->GetArena(), compare, HDeoptimize::Kind::kInline, dex_pc); + graph_->GetArena(), compare, DeoptimizationKind::kCHA, dex_pc); if (cursor != nullptr) { bb_cursor->InsertInstructionAfter(deopt_flag, cursor); @@ -860,7 +860,9 @@ HInstruction* HInliner::AddTypeGuard(HInstruction* receiver, graph_->GetArena(), compare, receiver, - HDeoptimize::Kind::kInline, + Runtime::Current()->IsAotCompiler() + ? DeoptimizationKind::kAotInlineCache + : DeoptimizationKind::kJitInlineCache, invoke_instruction->GetDexPc()); bb_cursor->InsertInstructionAfter(deoptimize, compare); deoptimize->CopyEnvironmentFrom(invoke_instruction->GetEnvironment()); @@ -1147,7 +1149,7 @@ bool HInliner::TryInlinePolymorphicCallToSameTarget( graph_->GetArena(), compare, receiver, - HDeoptimize::Kind::kInline, + DeoptimizationKind::kJitSameTarget, invoke_instruction->GetDexPc()); bb_cursor->InsertInstructionAfter(deoptimize, compare); deoptimize->CopyEnvironmentFrom(invoke_instruction->GetEnvironment()); |