diff options
Diffstat (limited to 'compiler/optimizing/inliner.cc')
| -rw-r--r-- | compiler/optimizing/inliner.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc index 0547ce832d..efd4fcfc79 100644 --- a/compiler/optimizing/inliner.cc +++ b/compiler/optimizing/inliner.cc @@ -423,8 +423,8 @@ bool HInliner::TryBuildAndInline(ArtMethod* resolved_method, } bool has_throw_predecessor = false; - for (size_t i = 0, e = exit_block->GetPredecessors().Size(); i < e; ++i) { - if (exit_block->GetPredecessors().Get(i)->GetLastInstruction()->IsThrow()) { + for (HBasicBlock* predecessor : exit_block->GetPredecessors()) { + if (predecessor->GetLastInstruction()->IsThrow()) { has_throw_predecessor = true; break; } @@ -506,7 +506,7 @@ bool HInliner::TryBuildAndInline(ArtMethod* resolved_method, ReferenceTypeInfo::TypeHandle return_handle = handles_->NewHandle(resolved_method->GetReturnType(true /* resolve */, pointer_size)); return_replacement->SetReferenceTypeInfo(ReferenceTypeInfo::Create( - return_handle, return_handle->IsFinal() /* is_exact */)); + return_handle, return_handle->CannotBeAssignedFromOtherTypes() /* is_exact */)); } } |