diff options
| author | 2016-10-05 17:00:41 +0000 | |
|---|---|---|
| committer | 2016-10-05 17:00:41 +0000 | |
| commit | 2f61867045ffbd0c38a4ecec5f59632004f7efff (patch) | |
| tree | c7b4393d7cd7cbcd3272ff83d8424be02828251a /compiler/optimizing | |
| parent | 4aa6a93c46a959df1ab71ee7a68ad345338046ef (diff) | |
| parent | 97d7e1cd7f733cb33a0e238bec6d7ed525638cd1 (diff) | |
Merge "Remove #include "oat_file.h" from class_linker.h ."
Diffstat (limited to 'compiler/optimizing')
| -rw-r--r-- | compiler/optimizing/inliner.cc | 2 | ||||
| -rw-r--r-- | compiler/optimizing/optimizing_compiler.cc | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc index af2fe9cb1f..6080551900 100644 --- a/compiler/optimizing/inliner.cc +++ b/compiler/optimizing/inliner.cc @@ -1138,7 +1138,7 @@ bool HInliner::TryBuildAndInlineHelper(HInvoke* invoke_instruction, *code_item, compiler_driver_, inline_stats.get(), - resolved_method->GetQuickenedInfo(), + resolved_method->GetQuickenedInfo(class_linker->GetImagePointerSize()), dex_cache, handles_); diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index 52d6e0b3f1..d6f8307ac2 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -872,9 +872,10 @@ CodeGenerator* OptimizingCompiler::TryCompile(ArenaAllocator* arena, return nullptr; } + ClassLinker* class_linker = Runtime::Current()->GetClassLinker(); DexCompilationUnit dex_compilation_unit( class_loader, - Runtime::Current()->GetClassLinker(), + class_linker, dex_file, code_item, class_def_idx, @@ -913,7 +914,7 @@ CodeGenerator* OptimizingCompiler::TryCompile(ArenaAllocator* arena, if (method != nullptr) { graph->SetArtMethod(method); ScopedObjectAccess soa(Thread::Current()); - interpreter_metadata = method->GetQuickenedInfo(); + interpreter_metadata = method->GetQuickenedInfo(class_linker->GetImagePointerSize()); uint16_t type_index = method->GetDeclaringClass()->GetDexTypeIndex(); // Update the dex cache if the type is not in it yet. Note that under AOT, |