diff options
| author | 2016-10-04 14:44:28 +0100 | |
|---|---|---|
| committer | 2016-10-05 13:21:44 +0100 | |
| commit | 97d7e1cd7f733cb33a0e238bec6d7ed525638cd1 (patch) | |
| tree | d2f02420f82d76d10dc0d80f431c9f4aba03ac82 /compiler/optimizing/optimizing_compiler.cc | |
| parent | eebe142e935e9444c7c947d02246e7fbe88b2cc4 (diff) | |
Remove #include "oat_file.h" from class_linker.h .
Refactor the OatClass and OatMethod related functions from
ClassLinker to OatFile and ArtMethod, respectively. Refactor
the remaining ClassLinker dependencies on OatFile to break
the #include dependency and reduce incremental build times.
Test: m test-art-host
Change-Id: Iebc5b9f81b48fbcf79821cc827a5d7c4a0261bf6
Diffstat (limited to 'compiler/optimizing/optimizing_compiler.cc')
| -rw-r--r-- | compiler/optimizing/optimizing_compiler.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index d3a55dd365..99504aaa8a 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -867,9 +867,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, @@ -908,7 +909,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, |