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
diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc
index af2fe9c..6080551 100644
--- a/compiler/optimizing/inliner.cc
+++ b/compiler/optimizing/inliner.cc
@@ -1138,7 +1138,7 @@
*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 d3a55dd..99504aa 100644
--- a/compiler/optimizing/optimizing_compiler.cc
+++ b/compiler/optimizing/optimizing_compiler.cc
@@ -867,9 +867,10 @@
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 @@
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,