diff options
| author | 2015-08-07 15:31:20 +0000 | |
|---|---|---|
| committer | 2015-08-07 15:31:20 +0000 | |
| commit | a001e3a0200fe137feeaaead3c99026abce914cd (patch) | |
| tree | 59e45e77430ab4df2067dd758a113c07eddeee51 /compiler | |
| parent | 4320ff10bb344140b75e029c6a4d46b070399682 (diff) | |
| parent | f25b661b3708c865cdaa0a018372a42881353bea (diff) | |
Merge "Revert "Pass the verified method to the inlinee DexCompilationUnit.""
Diffstat (limited to 'compiler')
| -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 4c746798be..01065959d8 100644 --- a/compiler/optimizing/inliner.cc +++ b/compiler/optimizing/inliner.cc @@ -276,12 +276,12 @@ bool HInliner::TryBuildAndInline(ArtMethod* resolved_method, nullptr, caller_compilation_unit_.GetClassLoader(), class_linker, - callee_dex_file, + *resolved_method->GetDexFile(), code_item, resolved_method->GetDeclaringClass()->GetDexClassDefIndex(), - method_index, + resolved_method->GetDexMethodIndex(), resolved_method->GetAccessFlags(), - compiler_driver_->GetVerifiedMethod(&callee_dex_file, method_index)); + nullptr); bool requires_ctor_barrier = false; |