diff options
Diffstat (limited to 'compiler/optimizing')
-rw-r--r-- | compiler/optimizing/block_builder.cc | 2 | ||||
-rw-r--r-- | compiler/optimizing/code_generator.cc | 2 | ||||
-rw-r--r-- | compiler/optimizing/code_generator.h | 4 | ||||
-rw-r--r-- | compiler/optimizing/code_generator_arm64.h | 4 | ||||
-rw-r--r-- | compiler/optimizing/code_generator_arm_vixl.h | 4 | ||||
-rw-r--r-- | compiler/optimizing/code_generator_mips.h | 4 | ||||
-rw-r--r-- | compiler/optimizing/code_generator_mips64.h | 2 | ||||
-rw-r--r-- | compiler/optimizing/instruction_builder.cc | 2 | ||||
-rw-r--r-- | compiler/optimizing/nodes.h | 2 | ||||
-rw-r--r-- | compiler/optimizing/ssa_builder.cc | 2 |
10 files changed, 14 insertions, 14 deletions
diff --git a/compiler/optimizing/block_builder.cc b/compiler/optimizing/block_builder.cc index 2b568bcffd..95f2e98ac6 100644 --- a/compiler/optimizing/block_builder.cc +++ b/compiler/optimizing/block_builder.cc @@ -17,7 +17,7 @@ #include "block_builder.h" #include "base/logging.h" // FOR VLOG. -#include "bytecode_utils.h" +#include "dex/bytecode_utils.h" #include "dex/code_item_accessors-inl.h" #include "dex/dex_file_exception_helpers.h" #include "quicken_info.h" diff --git a/compiler/optimizing/code_generator.cc b/compiler/optimizing/code_generator.cc index 0fcc9c6d05..c2ae7646b5 100644 --- a/compiler/optimizing/code_generator.cc +++ b/compiler/optimizing/code_generator.cc @@ -44,9 +44,9 @@ #include "base/bit_utils_iterator.h" #include "base/casts.h" #include "base/leb128.h" -#include "bytecode_utils.h" #include "class_linker.h" #include "compiled_method.h" +#include "dex/bytecode_utils.h" #include "dex/code_item_accessors-inl.h" #include "dex/verified_method.h" #include "driver/compiler_driver.h" diff --git a/compiler/optimizing/code_generator.h b/compiler/optimizing/code_generator.h index 7031483a77..a4873202b2 100644 --- a/compiler/optimizing/code_generator.h +++ b/compiler/optimizing/code_generator.h @@ -24,6 +24,8 @@ #include "base/bit_field.h" #include "base/bit_utils.h" #include "base/enums.h" +#include "dex/string_reference.h" +#include "dex/type_reference.h" #include "globals.h" #include "graph_visualizer.h" #include "locations.h" @@ -33,8 +35,6 @@ #include "read_barrier_option.h" #include "stack.h" #include "stack_map.h" -#include "string_reference.h" -#include "type_reference.h" #include "utils/label.h" namespace art { diff --git a/compiler/optimizing/code_generator_arm64.h b/compiler/optimizing/code_generator_arm64.h index b59ccd9034..a8a9802f9a 100644 --- a/compiler/optimizing/code_generator_arm64.h +++ b/compiler/optimizing/code_generator_arm64.h @@ -21,11 +21,11 @@ #include "code_generator.h" #include "common_arm64.h" #include "dex/dex_file_types.h" +#include "dex/string_reference.h" +#include "dex/type_reference.h" #include "driver/compiler_options.h" #include "nodes.h" #include "parallel_move_resolver.h" -#include "string_reference.h" -#include "type_reference.h" #include "utils/arm64/assembler_arm64.h" // TODO(VIXL): Make VIXL compile with -Wshadow. diff --git a/compiler/optimizing/code_generator_arm_vixl.h b/compiler/optimizing/code_generator_arm_vixl.h index 2d8f6a6c78..6a07e36022 100644 --- a/compiler/optimizing/code_generator_arm_vixl.h +++ b/compiler/optimizing/code_generator_arm_vixl.h @@ -20,11 +20,11 @@ #include "base/enums.h" #include "code_generator.h" #include "common_arm.h" +#include "dex/string_reference.h" +#include "dex/type_reference.h" #include "driver/compiler_options.h" #include "nodes.h" #include "parallel_move_resolver.h" -#include "string_reference.h" -#include "type_reference.h" #include "utils/arm/assembler_arm_vixl.h" // TODO(VIXL): make vixl clean wrt -Wshadow. diff --git a/compiler/optimizing/code_generator_mips.h b/compiler/optimizing/code_generator_mips.h index d90689695b..1f1743ff9e 100644 --- a/compiler/optimizing/code_generator_mips.h +++ b/compiler/optimizing/code_generator_mips.h @@ -19,11 +19,11 @@ #include "code_generator.h" #include "dex/dex_file_types.h" +#include "dex/string_reference.h" +#include "dex/type_reference.h" #include "driver/compiler_options.h" #include "nodes.h" #include "parallel_move_resolver.h" -#include "string_reference.h" -#include "type_reference.h" #include "utils/mips/assembler_mips.h" namespace art { diff --git a/compiler/optimizing/code_generator_mips64.h b/compiler/optimizing/code_generator_mips64.h index d1da1cec15..74c947e5d5 100644 --- a/compiler/optimizing/code_generator_mips64.h +++ b/compiler/optimizing/code_generator_mips64.h @@ -18,10 +18,10 @@ #define ART_COMPILER_OPTIMIZING_CODE_GENERATOR_MIPS64_H_ #include "code_generator.h" +#include "dex/type_reference.h" #include "driver/compiler_options.h" #include "nodes.h" #include "parallel_move_resolver.h" -#include "type_reference.h" #include "utils/mips64/assembler_mips64.h" namespace art { diff --git a/compiler/optimizing/instruction_builder.cc b/compiler/optimizing/instruction_builder.cc index a38e2717cf..c7aef3779d 100644 --- a/compiler/optimizing/instruction_builder.cc +++ b/compiler/optimizing/instruction_builder.cc @@ -20,9 +20,9 @@ #include "base/arena_bit_vector.h" #include "base/bit_vector-inl.h" #include "block_builder.h" -#include "bytecode_utils.h" #include "class_linker.h" #include "data_type-inl.h" +#include "dex/bytecode_utils.h" #include "dex/dex_instruction-inl.h" #include "driver/compiler_driver-inl.h" #include "driver/dex_compilation_unit.h" diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h index cbf748d4fd..a8fcea2097 100644 --- a/compiler/optimizing/nodes.h +++ b/compiler/optimizing/nodes.h @@ -34,12 +34,12 @@ #include "dex/dex_file.h" #include "dex/dex_file_types.h" #include "dex/invoke_type.h" +#include "dex/method_reference.h" #include "entrypoints/quick/quick_entrypoints_enum.h" #include "handle.h" #include "handle_scope.h" #include "intrinsics_enum.h" #include "locations.h" -#include "method_reference.h" #include "mirror/class.h" #include "offsets.h" #include "utils/intrusive_forward_list.h" diff --git a/compiler/optimizing/ssa_builder.cc b/compiler/optimizing/ssa_builder.cc index cb384768b7..dd54468217 100644 --- a/compiler/optimizing/ssa_builder.cc +++ b/compiler/optimizing/ssa_builder.cc @@ -16,8 +16,8 @@ #include "ssa_builder.h" -#include "bytecode_utils.h" #include "data_type-inl.h" +#include "dex/bytecode_utils.h" #include "mirror/class-inl.h" #include "nodes.h" #include "reference_type_propagation.h" |