From d8dbc8da0e5cc6b5c2176ce2d3877e6194d72c0c Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Wed, 20 Sep 2017 13:37:47 +0100 Subject: Refactor compiled_method.h . Move LinkerPatch to compiler/linker/linker_patch.h . Move SrcMapElem to compiler/debug/src_map_elem.h . Introduce compiled_method-inl.h to reduce the number of `#include`s in compiled_method.h . Test: m test-art-host-gtest Test: testrunner.py --host Change-Id: Id211cdf94a63ad265bf4709f1a5e06dffbe30f64 --- compiler/driver/compiler_driver.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'compiler/driver/compiler_driver.cc') diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index 678f090532..03d8ef5915 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -37,7 +37,7 @@ #include "base/time_utils.h" #include "base/timing_logger.h" #include "class_linker-inl.h" -#include "compiled_method.h" +#include "compiled_method-inl.h" #include "compiler.h" #include "compiler_callbacks.h" #include "compiler_driver-inl.h" @@ -55,6 +55,7 @@ #include "handle_scope-inl.h" #include "intrinsics_enum.h" #include "jni_internal.h" +#include "linker/linker_patch.h" #include "mirror/class-inl.h" #include "mirror/class_loader.h" #include "mirror/dex_cache-inl.h" @@ -618,7 +619,7 @@ static void CompileMethod(Thread* self, if (compiled_method != nullptr) { // Count non-relative linker patches. size_t non_relative_linker_patch_count = 0u; - for (const LinkerPatch& patch : compiled_method->GetPatches()) { + for (const linker::LinkerPatch& patch : compiled_method->GetPatches()) { if (!patch.IsPcRelative()) { ++non_relative_linker_patch_count; } -- cgit v1.2.3-59-g8ed1b