diff options
| author | 2018-01-13 01:40:55 +0000 | |
|---|---|---|
| committer | 2018-01-13 01:40:55 +0000 | |
| commit | c3e60f38c81a3dd4ff49dca0f05f84a8b464004f (patch) | |
| tree | fa10893a270bad91d3503a761f140cbe9c97a74c /compiler/optimizing/inliner.cc | |
| parent | 3c9e0f69b04b614c44448e66e15c6f8a78da4b2c (diff) | |
| parent | 8892c6bd9235e7ae697039c901aaeea1597a7473 (diff) | |
Merge changes Ib983e85c,Ic01ea4e8
* changes:
Move debug info offsets into a side table
Revert "Revert "Move quickening info logic to its own table""
Diffstat (limited to 'compiler/optimizing/inliner.cc')
| -rw-r--r-- | compiler/optimizing/inliner.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc index b2ad8ec400..81a75584a4 100644 --- a/compiler/optimizing/inliner.cc +++ b/compiler/optimizing/inliner.cc @@ -1660,7 +1660,7 @@ bool HInliner::TryBuildAndInlineHelper(HInvoke* invoke_instruction, const DexFile::CodeItem* code_item = resolved_method->GetCodeItem(); const DexFile& callee_dex_file = *resolved_method->GetDexFile(); uint32_t method_index = resolved_method->GetDexMethodIndex(); - CodeItemDebugInfoAccessor code_item_accessor(callee_dex_file, code_item); + CodeItemDebugInfoAccessor code_item_accessor(resolved_method); ClassLinker* class_linker = caller_compilation_unit_.GetClassLinker(); Handle<mirror::DexCache> dex_cache = NewHandleIfDifferent(resolved_method->GetDexCache(), caller_compilation_unit_.GetDexCache(), |