From 5868adaefe72cc8bcdcd8325c40f712375a506d1 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Tue, 12 May 2020 11:50:34 +0100 Subject: Move implementations from class_root.h to -inl.h . Make it possible to include the definition of enum ClassRoot without pulling in a lot of other headers. Test: m test-art-host-gtest Test: testrunner.py --host --optimizing Test: aosp_taimen-userdebug boots. Change-Id: Ic90fdd70bfe0c5428a5c9a0d7901ea7e15b03488 --- compiler/optimizing/inliner.cc | 2 +- compiler/optimizing/instruction_simplifier.cc | 2 +- compiler/optimizing/intrinsics.cc | 2 +- compiler/optimizing/nodes.cc | 2 +- compiler/optimizing/optimizing_compiler.cc | 1 - compiler/optimizing/reference_type_propagation.cc | 2 +- 6 files changed, 5 insertions(+), 6 deletions(-) (limited to 'compiler/optimizing') diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc index 126bf25f06..5472839027 100644 --- a/compiler/optimizing/inliner.cc +++ b/compiler/optimizing/inliner.cc @@ -21,7 +21,7 @@ #include "base/logging.h" #include "builder.h" #include "class_linker.h" -#include "class_root.h" +#include "class_root-inl.h" #include "constant_folding.h" #include "data_type-inl.h" #include "dead_code_elimination.h" diff --git a/compiler/optimizing/instruction_simplifier.cc b/compiler/optimizing/instruction_simplifier.cc index 8e0b4145e3..5ac77a5484 100644 --- a/compiler/optimizing/instruction_simplifier.cc +++ b/compiler/optimizing/instruction_simplifier.cc @@ -18,7 +18,7 @@ #include "art_method-inl.h" #include "class_linker-inl.h" -#include "class_root.h" +#include "class_root-inl.h" #include "data_type-inl.h" #include "escape.h" #include "intrinsics.h" diff --git a/compiler/optimizing/intrinsics.cc b/compiler/optimizing/intrinsics.cc index d9401050df..1563a7e04b 100644 --- a/compiler/optimizing/intrinsics.cc +++ b/compiler/optimizing/intrinsics.cc @@ -20,7 +20,7 @@ #include "art_method-inl.h" #include "base/utils.h" #include "class_linker.h" -#include "class_root.h" +#include "class_root-inl.h" #include "dex/invoke_type.h" #include "driver/compiler_options.h" #include "gc/space/image_space.h" diff --git a/compiler/optimizing/nodes.cc b/compiler/optimizing/nodes.cc index 810871c18f..a5e0991578 100644 --- a/compiler/optimizing/nodes.cc +++ b/compiler/optimizing/nodes.cc @@ -23,7 +23,7 @@ #include "base/logging.h" #include "base/stl_util.h" #include "class_linker-inl.h" -#include "class_root.h" +#include "class_root-inl.h" #include "code_generator.h" #include "common_dominator.h" #include "intrinsics.h" diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index 3945b17c0d..bf9afa27eb 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -32,7 +32,6 @@ #include "base/scoped_arena_allocator.h" #include "base/timing_logger.h" #include "builder.h" -#include "class_root.h" #include "code_generator.h" #include "compiled_method.h" #include "compiler.h" diff --git a/compiler/optimizing/reference_type_propagation.cc b/compiler/optimizing/reference_type_propagation.cc index 4929e0a3a1..fb7222ccf6 100644 --- a/compiler/optimizing/reference_type_propagation.cc +++ b/compiler/optimizing/reference_type_propagation.cc @@ -22,7 +22,7 @@ #include "base/scoped_arena_containers.h" #include "base/enums.h" #include "class_linker-inl.h" -#include "class_root.h" +#include "class_root-inl.h" #include "handle_scope-inl.h" #include "mirror/class-inl.h" #include "mirror/dex_cache.h" -- cgit v1.2.3-59-g8ed1b