diff options
Diffstat (limited to 'compiler/optimizing')
50 files changed, 87 insertions, 68 deletions
diff --git a/compiler/optimizing/bounds_check_elimination.cc b/compiler/optimizing/bounds_check_elimination.cc index f3ecdf036a..c166deb406 100644 --- a/compiler/optimizing/bounds_check_elimination.cc +++ b/compiler/optimizing/bounds_check_elimination.cc @@ -20,8 +20,8 @@ #include "base/arena_containers.h" #include "induction_var_range.h" -#include "side_effects_analysis.h" #include "nodes.h" +#include "side_effects_analysis.h" namespace art { diff --git a/compiler/optimizing/bounds_check_elimination_test.cc b/compiler/optimizing/bounds_check_elimination_test.cc index a949c33149..575e2fc24a 100644 --- a/compiler/optimizing/bounds_check_elimination_test.cc +++ b/compiler/optimizing/bounds_check_elimination_test.cc @@ -14,8 +14,9 @@ * limitations under the License. */ -#include "base/arena_allocator.h" #include "bounds_check_elimination.h" + +#include "base/arena_allocator.h" #include "builder.h" #include "gvn.h" #include "induction_var_analysis.h" diff --git a/compiler/optimizing/builder.h b/compiler/optimizing/builder.h index 3a4c9dbd16..43429cf3d2 100644 --- a/compiler/optimizing/builder.h +++ b/compiler/optimizing/builder.h @@ -20,14 +20,14 @@ #include "base/arena_containers.h" #include "base/arena_object.h" #include "block_builder.h" -#include "dex_file.h" #include "dex_file-inl.h" +#include "dex_file.h" #include "driver/compiler_driver.h" #include "driver/dex_compilation_unit.h" #include "instruction_builder.h" +#include "nodes.h" #include "optimizing_compiler_stats.h" #include "primitive.h" -#include "nodes.h" #include "ssa_builder.h" namespace art { diff --git a/compiler/optimizing/code_generator.cc b/compiler/optimizing/code_generator.cc index 2872cf7458..d7d0ffffda 100644 --- a/compiler/optimizing/code_generator.cc +++ b/compiler/optimizing/code_generator.cc @@ -57,8 +57,8 @@ #include "mirror/reference.h" #include "mirror/string.h" #include "parallel_move_resolver.h" -#include "ssa_liveness_analysis.h" #include "scoped_thread_state_change-inl.h" +#include "ssa_liveness_analysis.h" #include "thread-current-inl.h" #include "utils/assembler.h" diff --git a/compiler/optimizing/code_generator_arm64.cc b/compiler/optimizing/code_generator_arm64.cc index 7e5b1a0fd1..4999950600 100644 --- a/compiler/optimizing/code_generator_arm64.cc +++ b/compiler/optimizing/code_generator_arm64.cc @@ -29,9 +29,9 @@ #include "intrinsics.h" #include "intrinsics_arm64.h" #include "linker/arm64/relative_patcher_arm64.h" +#include "lock_word.h" #include "mirror/array-inl.h" #include "mirror/class-inl.h" -#include "lock_word.h" #include "offsets.h" #include "thread.h" #include "utils/arm64/assembler_arm64.h" diff --git a/compiler/optimizing/code_generator_arm_vixl.h b/compiler/optimizing/code_generator_arm_vixl.h index 01cf287f29..7ab2993161 100644 --- a/compiler/optimizing/code_generator_arm_vixl.h +++ b/compiler/optimizing/code_generator_arm_vixl.h @@ -22,8 +22,8 @@ #include "common_arm.h" #include "driver/compiler_options.h" #include "nodes.h" -#include "string_reference.h" #include "parallel_move_resolver.h" +#include "string_reference.h" #include "type_reference.h" #include "utils/arm/assembler_arm_vixl.h" diff --git a/compiler/optimizing/code_generator_x86.cc b/compiler/optimizing/code_generator_x86.cc index af0e6462a2..142cc7f71f 100644 --- a/compiler/optimizing/code_generator_x86.cc +++ b/compiler/optimizing/code_generator_x86.cc @@ -24,9 +24,9 @@ #include "gc/accounting/card_table.h" #include "intrinsics.h" #include "intrinsics_x86.h" +#include "lock_word.h" #include "mirror/array-inl.h" #include "mirror/class-inl.h" -#include "lock_word.h" #include "thread.h" #include "utils/assembler.h" #include "utils/stack_checks.h" diff --git a/compiler/optimizing/common_arm.h b/compiler/optimizing/common_arm.h index 8fcceedcf6..e354654ee8 100644 --- a/compiler/optimizing/common_arm.h +++ b/compiler/optimizing/common_arm.h @@ -17,8 +17,8 @@ #ifndef ART_COMPILER_OPTIMIZING_COMMON_ARM_H_ #define ART_COMPILER_OPTIMIZING_COMMON_ARM_H_ -#include "instruction_simplifier_shared.h" #include "debug/dwarf/register.h" +#include "instruction_simplifier_shared.h" #include "locations.h" #include "nodes.h" #include "utils/arm/constants_arm.h" diff --git a/compiler/optimizing/dead_code_elimination_test.cc b/compiler/optimizing/dead_code_elimination_test.cc index fdd77e7261..96fa5406b2 100644 --- a/compiler/optimizing/dead_code_elimination_test.cc +++ b/compiler/optimizing/dead_code_elimination_test.cc @@ -14,9 +14,10 @@ * limitations under the License. */ +#include "dead_code_elimination.h" + #include "arch/x86/instruction_set_features_x86.h" #include "code_generator_x86.h" -#include "dead_code_elimination.h" #include "driver/compiler_options.h" #include "graph_checker.h" #include "optimizing_unit_test.h" diff --git a/compiler/optimizing/find_loops_test.cc b/compiler/optimizing/find_loops_test.cc index 04789d9a2d..bbd28f5c46 100644 --- a/compiler/optimizing/find_loops_test.cc +++ b/compiler/optimizing/find_loops_test.cc @@ -20,8 +20,8 @@ #include "dex_instruction.h" #include "nodes.h" #include "optimizing_unit_test.h" -#include "ssa_liveness_analysis.h" #include "pretty_printer.h" +#include "ssa_liveness_analysis.h" #include "gtest/gtest.h" diff --git a/compiler/optimizing/graph_checker.cc b/compiler/optimizing/graph_checker.cc index aea901dec7..327e11f7e7 100644 --- a/compiler/optimizing/graph_checker.cc +++ b/compiler/optimizing/graph_checker.cc @@ -17,8 +17,8 @@ #include "graph_checker.h" #include <algorithm> -#include <string> #include <sstream> +#include <string> #include "android-base/stringprintf.h" diff --git a/compiler/optimizing/gvn_test.cc b/compiler/optimizing/gvn_test.cc index f8d37bd714..e1ed7f656e 100644 --- a/compiler/optimizing/gvn_test.cc +++ b/compiler/optimizing/gvn_test.cc @@ -14,9 +14,10 @@ * limitations under the License. */ +#include "gvn.h" + #include "base/arena_allocator.h" #include "builder.h" -#include "gvn.h" #include "nodes.h" #include "optimizing_unit_test.h" #include "side_effects_analysis.h" diff --git a/compiler/optimizing/induction_var_range_test.cc b/compiler/optimizing/induction_var_range_test.cc index 67d2093829..2b82b336d7 100644 --- a/compiler/optimizing/induction_var_range_test.cc +++ b/compiler/optimizing/induction_var_range_test.cc @@ -14,10 +14,11 @@ * limitations under the License. */ +#include "induction_var_range.h" + #include "base/arena_allocator.h" #include "builder.h" #include "induction_var_analysis.h" -#include "induction_var_range.h" #include "nodes.h" #include "optimizing_unit_test.h" diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc index 18390cc4d4..38a1a8c024 100644 --- a/compiler/optimizing/inliner.cc +++ b/compiler/optimizing/inliner.cc @@ -23,8 +23,8 @@ #include "constant_folding.h" #include "dead_code_elimination.h" #include "dex/inline_method_analyser.h" -#include "dex/verified_method.h" #include "dex/verification_results.h" +#include "dex/verified_method.h" #include "driver/compiler_driver-inl.h" #include "driver/compiler_options.h" #include "driver/dex_compilation_unit.h" @@ -38,10 +38,10 @@ #include "optimizing_compiler.h" #include "reference_type_propagation.h" #include "register_allocator_linear_scan.h" +#include "scoped_thread_state_change-inl.h" #include "sharpening.h" #include "ssa_builder.h" #include "ssa_phi_elimination.h" -#include "scoped_thread_state_change-inl.h" #include "thread.h" namespace art { diff --git a/compiler/optimizing/inliner.h b/compiler/optimizing/inliner.h index 67476b6956..62c6713208 100644 --- a/compiler/optimizing/inliner.h +++ b/compiler/optimizing/inliner.h @@ -19,8 +19,8 @@ #include "dex_file_types.h" #include "invoke_type.h" -#include "optimization.h" #include "jit/profile_compilation_info.h" +#include "optimization.h" namespace art { diff --git a/compiler/optimizing/instruction_builder.cc b/compiler/optimizing/instruction_builder.cc index 8054140924..143c77f334 100644 --- a/compiler/optimizing/instruction_builder.cc +++ b/compiler/optimizing/instruction_builder.cc @@ -23,8 +23,8 @@ #include "driver/compiler_options.h" #include "imtable-inl.h" #include "quicken_info.h" -#include "sharpening.h" #include "scoped_thread_state_change-inl.h" +#include "sharpening.h" namespace art { diff --git a/compiler/optimizing/instruction_builder.h b/compiler/optimizing/instruction_builder.h index 5a83df3813..2a9b9f513d 100644 --- a/compiler/optimizing/instruction_builder.h +++ b/compiler/optimizing/instruction_builder.h @@ -21,8 +21,8 @@ #include "base/arena_object.h" #include "block_builder.h" #include "dex_file_types.h" -#include "driver/compiler_driver.h" #include "driver/compiler_driver-inl.h" +#include "driver/compiler_driver.h" #include "driver/dex_compilation_unit.h" #include "mirror/dex_cache.h" #include "nodes.h" diff --git a/compiler/optimizing/instruction_simplifier.cc b/compiler/optimizing/instruction_simplifier.cc index f2a8cc0333..02cfbbcfb3 100644 --- a/compiler/optimizing/instruction_simplifier.cc +++ b/compiler/optimizing/instruction_simplifier.cc @@ -21,8 +21,8 @@ #include "escape.h" #include "intrinsics.h" #include "mirror/class-inl.h" -#include "sharpening.h" #include "scoped_thread_state_change-inl.h" +#include "sharpening.h" namespace art { diff --git a/compiler/optimizing/instruction_simplifier_arm.cc b/compiler/optimizing/instruction_simplifier_arm.cc index a025fb10ce..a32d0ce42b 100644 --- a/compiler/optimizing/instruction_simplifier_arm.cc +++ b/compiler/optimizing/instruction_simplifier_arm.cc @@ -14,9 +14,10 @@ * limitations under the License. */ +#include "instruction_simplifier_arm.h" + #include "code_generator.h" #include "common_arm.h" -#include "instruction_simplifier_arm.h" #include "instruction_simplifier_shared.h" #include "mirror/array-inl.h" #include "mirror/string.h" diff --git a/compiler/optimizing/intrinsics.cc b/compiler/optimizing/intrinsics.cc index b664d41013..7bdeef527e 100644 --- a/compiler/optimizing/intrinsics.cc +++ b/compiler/optimizing/intrinsics.cc @@ -39,7 +39,7 @@ static inline InvokeType GetIntrinsicInvokeType(Intrinsics i) { case Intrinsics::k ## Name: \ return IsStatic; #include "intrinsics_list.h" -INTRINSICS_LIST(OPTIMIZING_INTRINSICS) + INTRINSICS_LIST(OPTIMIZING_INTRINSICS) #undef INTRINSICS_LIST #undef OPTIMIZING_INTRINSICS } @@ -55,7 +55,7 @@ static inline IntrinsicNeedsEnvironmentOrCache NeedsEnvironmentOrCache(Intrinsic case Intrinsics::k ## Name: \ return NeedsEnvironmentOrCache; #include "intrinsics_list.h" -INTRINSICS_LIST(OPTIMIZING_INTRINSICS) + INTRINSICS_LIST(OPTIMIZING_INTRINSICS) #undef INTRINSICS_LIST #undef OPTIMIZING_INTRINSICS } @@ -71,7 +71,7 @@ static inline IntrinsicSideEffects GetSideEffects(Intrinsics i) { case Intrinsics::k ## Name: \ return SideEffects; #include "intrinsics_list.h" -INTRINSICS_LIST(OPTIMIZING_INTRINSICS) + INTRINSICS_LIST(OPTIMIZING_INTRINSICS) #undef INTRINSICS_LIST #undef OPTIMIZING_INTRINSICS } @@ -87,7 +87,7 @@ static inline IntrinsicExceptions GetExceptions(Intrinsics i) { case Intrinsics::k ## Name: \ return Exceptions; #include "intrinsics_list.h" -INTRINSICS_LIST(OPTIMIZING_INTRINSICS) + INTRINSICS_LIST(OPTIMIZING_INTRINSICS) #undef INTRINSICS_LIST #undef OPTIMIZING_INTRINSICS } @@ -172,7 +172,7 @@ std::ostream& operator<<(std::ostream& os, const Intrinsics& intrinsic) { os << # Name; \ break; #include "intrinsics_list.h" -INTRINSICS_LIST(OPTIMIZING_INTRINSICS) + INTRINSICS_LIST(OPTIMIZING_INTRINSICS) #undef STATIC_INTRINSICS_LIST #undef VIRTUAL_INTRINSICS_LIST #undef OPTIMIZING_INTRINSICS diff --git a/compiler/optimizing/intrinsics.h b/compiler/optimizing/intrinsics.h index 9da5a7fa3b..6411e82f92 100644 --- a/compiler/optimizing/intrinsics.h +++ b/compiler/optimizing/intrinsics.h @@ -63,7 +63,7 @@ class IntrinsicVisitor : public ValueObject { Visit ## Name(invoke); \ return; #include "intrinsics_list.h" -INTRINSICS_LIST(OPTIMIZING_INTRINSICS) + INTRINSICS_LIST(OPTIMIZING_INTRINSICS) #undef INTRINSICS_LIST #undef OPTIMIZING_INTRINSICS @@ -77,7 +77,7 @@ INTRINSICS_LIST(OPTIMIZING_INTRINSICS) virtual void Visit ## Name(HInvoke* invoke ATTRIBUTE_UNUSED) { \ } #include "intrinsics_list.h" -INTRINSICS_LIST(OPTIMIZING_INTRINSICS) + INTRINSICS_LIST(OPTIMIZING_INTRINSICS) #undef INTRINSICS_LIST #undef OPTIMIZING_INTRINSICS diff --git a/compiler/optimizing/intrinsics_arm64.h b/compiler/optimizing/intrinsics_arm64.h index ff59ce9658..5a6d180ed6 100644 --- a/compiler/optimizing/intrinsics_arm64.h +++ b/compiler/optimizing/intrinsics_arm64.h @@ -47,7 +47,7 @@ class IntrinsicLocationsBuilderARM64 FINAL : public IntrinsicVisitor { #define OPTIMIZING_INTRINSICS(Name, IsStatic, NeedsEnvironmentOrCache, SideEffects, Exceptions, ...) \ void Visit ## Name(HInvoke* invoke) OVERRIDE; #include "intrinsics_list.h" -INTRINSICS_LIST(OPTIMIZING_INTRINSICS) + INTRINSICS_LIST(OPTIMIZING_INTRINSICS) #undef INTRINSICS_LIST #undef OPTIMIZING_INTRINSICS @@ -72,7 +72,7 @@ class IntrinsicCodeGeneratorARM64 FINAL : public IntrinsicVisitor { #define OPTIMIZING_INTRINSICS(Name, IsStatic, NeedsEnvironmentOrCache, SideEffects, Exceptions, ...) \ void Visit ## Name(HInvoke* invoke) OVERRIDE; #include "intrinsics_list.h" -INTRINSICS_LIST(OPTIMIZING_INTRINSICS) + INTRINSICS_LIST(OPTIMIZING_INTRINSICS) #undef INTRINSICS_LIST #undef OPTIMIZING_INTRINSICS diff --git a/compiler/optimizing/intrinsics_arm_vixl.h b/compiler/optimizing/intrinsics_arm_vixl.h index 023cba1349..a4a2830211 100644 --- a/compiler/optimizing/intrinsics_arm_vixl.h +++ b/compiler/optimizing/intrinsics_arm_vixl.h @@ -36,7 +36,7 @@ class IntrinsicLocationsBuilderARMVIXL FINAL : public IntrinsicVisitor { #define OPTIMIZING_INTRINSICS(Name, IsStatic, NeedsEnvironmentOrCache, SideEffects, Exceptions, ...) \ void Visit ## Name(HInvoke* invoke) OVERRIDE; #include "intrinsics_list.h" -INTRINSICS_LIST(OPTIMIZING_INTRINSICS) + INTRINSICS_LIST(OPTIMIZING_INTRINSICS) #undef INTRINSICS_LIST #undef OPTIMIZING_INTRINSICS @@ -63,7 +63,7 @@ class IntrinsicCodeGeneratorARMVIXL FINAL : public IntrinsicVisitor { #define OPTIMIZING_INTRINSICS(Name, IsStatic, NeedsEnvironmentOrCache, SideEffects, Exceptions, ...) \ void Visit ## Name(HInvoke* invoke) OVERRIDE; #include "intrinsics_list.h" -INTRINSICS_LIST(OPTIMIZING_INTRINSICS) + INTRINSICS_LIST(OPTIMIZING_INTRINSICS) #undef INTRINSICS_LIST #undef OPTIMIZING_INTRINSICS diff --git a/compiler/optimizing/intrinsics_mips.h b/compiler/optimizing/intrinsics_mips.h index eaadad2515..05d1aa284a 100644 --- a/compiler/optimizing/intrinsics_mips.h +++ b/compiler/optimizing/intrinsics_mips.h @@ -39,7 +39,7 @@ class IntrinsicLocationsBuilderMIPS FINAL : public IntrinsicVisitor { #define OPTIMIZING_INTRINSICS(Name, IsStatic, NeedsEnvironmentOrCache, SideEffects, Exceptions, ...) \ void Visit ## Name(HInvoke* invoke) OVERRIDE; #include "intrinsics_list.h" -INTRINSICS_LIST(OPTIMIZING_INTRINSICS) + INTRINSICS_LIST(OPTIMIZING_INTRINSICS) #undef INTRINSICS_LIST #undef OPTIMIZING_INTRINSICS @@ -64,7 +64,7 @@ class IntrinsicCodeGeneratorMIPS FINAL : public IntrinsicVisitor { #define OPTIMIZING_INTRINSICS(Name, IsStatic, NeedsEnvironmentOrCache, SideEffects, Exceptions, ...) \ void Visit ## Name(HInvoke* invoke) OVERRIDE; #include "intrinsics_list.h" -INTRINSICS_LIST(OPTIMIZING_INTRINSICS) + INTRINSICS_LIST(OPTIMIZING_INTRINSICS) #undef INTRINSICS_LIST #undef OPTIMIZING_INTRINSICS diff --git a/compiler/optimizing/intrinsics_mips64.h b/compiler/optimizing/intrinsics_mips64.h index 179627ab20..6880a255c3 100644 --- a/compiler/optimizing/intrinsics_mips64.h +++ b/compiler/optimizing/intrinsics_mips64.h @@ -39,7 +39,7 @@ class IntrinsicLocationsBuilderMIPS64 FINAL : public IntrinsicVisitor { #define OPTIMIZING_INTRINSICS(Name, IsStatic, NeedsEnvironmentOrCache, SideEffects, Exceptions, ...) \ void Visit ## Name(HInvoke* invoke) OVERRIDE; #include "intrinsics_list.h" -INTRINSICS_LIST(OPTIMIZING_INTRINSICS) + INTRINSICS_LIST(OPTIMIZING_INTRINSICS) #undef INTRINSICS_LIST #undef OPTIMIZING_INTRINSICS @@ -64,7 +64,7 @@ class IntrinsicCodeGeneratorMIPS64 FINAL : public IntrinsicVisitor { #define OPTIMIZING_INTRINSICS(Name, IsStatic, NeedsEnvironmentOrCache, SideEffects, Exceptions, ...) \ void Visit ## Name(HInvoke* invoke) OVERRIDE; #include "intrinsics_list.h" -INTRINSICS_LIST(OPTIMIZING_INTRINSICS) + INTRINSICS_LIST(OPTIMIZING_INTRINSICS) #undef INTRINSICS_LIST #undef OPTIMIZING_INTRINSICS diff --git a/compiler/optimizing/intrinsics_x86.h b/compiler/optimizing/intrinsics_x86.h index 3743cb1371..22f11b1d34 100644 --- a/compiler/optimizing/intrinsics_x86.h +++ b/compiler/optimizing/intrinsics_x86.h @@ -39,7 +39,7 @@ class IntrinsicLocationsBuilderX86 FINAL : public IntrinsicVisitor { #define OPTIMIZING_INTRINSICS(Name, IsStatic, NeedsEnvironmentOrCache, SideEffects, Exceptions, ...) \ void Visit ## Name(HInvoke* invoke) OVERRIDE; #include "intrinsics_list.h" -INTRINSICS_LIST(OPTIMIZING_INTRINSICS) + INTRINSICS_LIST(OPTIMIZING_INTRINSICS) #undef INTRINSICS_LIST #undef OPTIMIZING_INTRINSICS @@ -64,7 +64,7 @@ class IntrinsicCodeGeneratorX86 FINAL : public IntrinsicVisitor { #define OPTIMIZING_INTRINSICS(Name, IsStatic, NeedsEnvironmentOrCache, SideEffects, Exceptions, ...) \ void Visit ## Name(HInvoke* invoke) OVERRIDE; #include "intrinsics_list.h" -INTRINSICS_LIST(OPTIMIZING_INTRINSICS) + INTRINSICS_LIST(OPTIMIZING_INTRINSICS) #undef INTRINSICS_LIST #undef OPTIMIZING_INTRINSICS diff --git a/compiler/optimizing/intrinsics_x86_64.h b/compiler/optimizing/intrinsics_x86_64.h index 97404aa568..4b287886af 100644 --- a/compiler/optimizing/intrinsics_x86_64.h +++ b/compiler/optimizing/intrinsics_x86_64.h @@ -39,7 +39,7 @@ class IntrinsicLocationsBuilderX86_64 FINAL : public IntrinsicVisitor { #define OPTIMIZING_INTRINSICS(Name, IsStatic, NeedsEnvironmentOrCache, SideEffects, Exceptions, ...) \ void Visit ## Name(HInvoke* invoke) OVERRIDE; #include "intrinsics_list.h" -INTRINSICS_LIST(OPTIMIZING_INTRINSICS) + INTRINSICS_LIST(OPTIMIZING_INTRINSICS) #undef INTRINSICS_LIST #undef OPTIMIZING_INTRINSICS @@ -64,7 +64,7 @@ class IntrinsicCodeGeneratorX86_64 FINAL : public IntrinsicVisitor { #define OPTIMIZING_INTRINSICS(Name, IsStatic, NeedsEnvironmentOrCache, SideEffects, Exceptions, ...) \ void Visit ## Name(HInvoke* invoke) OVERRIDE; #include "intrinsics_list.h" -INTRINSICS_LIST(OPTIMIZING_INTRINSICS) + INTRINSICS_LIST(OPTIMIZING_INTRINSICS) #undef INTRINSICS_LIST #undef OPTIMIZING_INTRINSICS diff --git a/compiler/optimizing/licm_test.cc b/compiler/optimizing/licm_test.cc index 8d15f78cce..8967d7cef2 100644 --- a/compiler/optimizing/licm_test.cc +++ b/compiler/optimizing/licm_test.cc @@ -14,9 +14,10 @@ * limitations under the License. */ +#include "licm.h" + #include "base/arena_allocator.h" #include "builder.h" -#include "licm.h" #include "nodes.h" #include "optimizing_unit_test.h" #include "side_effects_analysis.h" diff --git a/compiler/optimizing/load_store_elimination.cc b/compiler/optimizing/load_store_elimination.cc index 211528b4bd..fddda3d8c0 100644 --- a/compiler/optimizing/load_store_elimination.cc +++ b/compiler/optimizing/load_store_elimination.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "load_store_analysis.h" #include "load_store_elimination.h" #include "escape.h" +#include "load_store_analysis.h" #include "side_effects_analysis.h" #include <iostream> diff --git a/compiler/optimizing/locations.cc b/compiler/optimizing/locations.cc index a9fe209063..40fe35b31b 100644 --- a/compiler/optimizing/locations.cc +++ b/compiler/optimizing/locations.cc @@ -18,8 +18,8 @@ #include <type_traits> -#include "nodes.h" #include "code_generator.h" +#include "nodes.h" namespace art { diff --git a/compiler/optimizing/loop_optimization.cc b/compiler/optimizing/loop_optimization.cc index 422e58debb..274f065084 100644 --- a/compiler/optimizing/loop_optimization.cc +++ b/compiler/optimizing/loop_optimization.cc @@ -16,9 +16,9 @@ #include "loop_optimization.h" -#include "arch/instruction_set.h" #include "arch/arm/instruction_set_features_arm.h" #include "arch/arm64/instruction_set_features_arm64.h" +#include "arch/instruction_set.h" #include "arch/mips/instruction_set_features_mips.h" #include "arch/mips64/instruction_set_features_mips64.h" #include "arch/x86/instruction_set_features_x86.h" diff --git a/compiler/optimizing/nodes.cc b/compiler/optimizing/nodes.cc index 4ca833707b..ca48e08a7c 100644 --- a/compiler/optimizing/nodes.cc +++ b/compiler/optimizing/nodes.cc @@ -18,16 +18,16 @@ #include <cfloat> #include "art_method-inl.h" +#include "base/bit_utils.h" +#include "base/bit_vector-inl.h" +#include "base/stl_util.h" #include "class_linker-inl.h" #include "code_generator.h" #include "common_dominator.h" -#include "ssa_builder.h" -#include "base/bit_vector-inl.h" -#include "base/bit_utils.h" -#include "base/stl_util.h" #include "intrinsics.h" #include "mirror/class-inl.h" #include "scoped_thread_state_change-inl.h" +#include "ssa_builder.h" namespace art { diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h index 5e072cdb67..fa29378e42 100644 --- a/compiler/optimizing/nodes.h +++ b/compiler/optimizing/nodes.h @@ -28,14 +28,14 @@ #include "base/iteration_range.h" #include "base/stl_util.h" #include "base/transform_array_ref.h" +#include "deoptimization_kind.h" #include "dex_file.h" #include "dex_file_types.h" -#include "deoptimization_kind.h" #include "entrypoints/quick/quick_entrypoints_enum.h" #include "handle.h" #include "handle_scope.h" -#include "invoke_type.h" #include "intrinsics_enum.h" +#include "invoke_type.h" #include "locations.h" #include "method_reference.h" #include "mirror/class.h" diff --git a/compiler/optimizing/nodes_shared.cc b/compiler/optimizing/nodes_shared.cc index f145bf9130..f6d33f015f 100644 --- a/compiler/optimizing/nodes_shared.cc +++ b/compiler/optimizing/nodes_shared.cc @@ -14,9 +14,15 @@ * limitations under the License. */ -#include "common_arm64.h" +// Note: this include order may seem strange and is against the regular style. However it is the +// required order as nodes_shared does not have the right dependency chain and compilation +// will fail (as AsType on HInstruction will be defined before the full Instruction). +#include "nodes.h" + #include "nodes_shared.h" +#include "common_arm64.h" + namespace art { using helpers::CanFitInShifterOperand; diff --git a/compiler/optimizing/nodes_test.cc b/compiler/optimizing/nodes_test.cc index 7686ba851b..f3a78a064e 100644 --- a/compiler/optimizing/nodes_test.cc +++ b/compiler/optimizing/nodes_test.cc @@ -14,8 +14,9 @@ * limitations under the License. */ -#include "base/arena_allocator.h" #include "nodes.h" + +#include "base/arena_allocator.h" #include "optimizing_unit_test.h" #include "gtest/gtest.h" diff --git a/compiler/optimizing/optimizing_cfi_test.cc b/compiler/optimizing/optimizing_cfi_test.cc index 6cb27b3b1b..c24f1de93d 100644 --- a/compiler/optimizing/optimizing_cfi_test.cc +++ b/compiler/optimizing/optimizing_cfi_test.cc @@ -23,8 +23,8 @@ #include "gtest/gtest.h" #include "optimizing/code_generator.h" #include "optimizing/optimizing_unit_test.h" -#include "utils/assembler.h" #include "utils/arm/assembler_arm_vixl.h" +#include "utils/assembler.h" #include "utils/mips/assembler_mips.h" #include "utils/mips64/assembler_mips64.h" diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index b76a0df861..51101f104a 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -87,8 +87,8 @@ #include "prepare_for_register_allocation.h" #include "reference_type_propagation.h" #include "register_allocator_linear_scan.h" -#include "select_generator.h" #include "scheduler.h" +#include "select_generator.h" #include "sharpening.h" #include "side_effects_analysis.h" #include "ssa_builder.h" diff --git a/compiler/optimizing/optimizing_unit_test.h b/compiler/optimizing/optimizing_unit_test.h index 1cdcbd2e9b..08493fa177 100644 --- a/compiler/optimizing/optimizing_unit_test.h +++ b/compiler/optimizing/optimizing_unit_test.h @@ -17,12 +17,12 @@ #ifndef ART_COMPILER_OPTIMIZING_OPTIMIZING_UNIT_TEST_H_ #define ART_COMPILER_OPTIMIZING_OPTIMIZING_UNIT_TEST_H_ -#include "nodes.h" #include "builder.h" #include "common_compiler_test.h" #include "dex_file.h" #include "dex_instruction.h" #include "handle_scope.h" +#include "nodes.h" #include "scoped_thread_state_change.h" #include "ssa_builder.h" #include "ssa_liveness_analysis.h" diff --git a/compiler/optimizing/parallel_move_test.cc b/compiler/optimizing/parallel_move_test.cc index 5e8fe37669..50620f0e7b 100644 --- a/compiler/optimizing/parallel_move_test.cc +++ b/compiler/optimizing/parallel_move_test.cc @@ -18,8 +18,8 @@ #include "nodes.h" #include "parallel_move_resolver.h" -#include "gtest/gtest.h" #include "gtest/gtest-typed-test.h" +#include "gtest/gtest.h" namespace art { diff --git a/compiler/optimizing/pretty_printer_test.cc b/compiler/optimizing/pretty_printer_test.cc index 1af94f3445..14d2360392 100644 --- a/compiler/optimizing/pretty_printer_test.cc +++ b/compiler/optimizing/pretty_printer_test.cc @@ -14,13 +14,14 @@ * limitations under the License. */ +#include "pretty_printer.h" + #include "base/arena_allocator.h" #include "builder.h" #include "dex_file.h" #include "dex_instruction.h" #include "nodes.h" #include "optimizing_unit_test.h" -#include "pretty_printer.h" #include "gtest/gtest.h" diff --git a/compiler/optimizing/reference_type_propagation_test.cc b/compiler/optimizing/reference_type_propagation_test.cc index 0b49ce1a4c..d537459113 100644 --- a/compiler/optimizing/reference_type_propagation_test.cc +++ b/compiler/optimizing/reference_type_propagation_test.cc @@ -14,12 +14,13 @@ * limitations under the License. */ +#include "reference_type_propagation.h" + #include "base/arena_allocator.h" #include "builder.h" #include "nodes.h" #include "object_lock.h" #include "optimizing_unit_test.h" -#include "reference_type_propagation.h" namespace art { diff --git a/compiler/optimizing/register_allocator.cc b/compiler/optimizing/register_allocator.cc index 5b768d5d67..c3b33e29d7 100644 --- a/compiler/optimizing/register_allocator.cc +++ b/compiler/optimizing/register_allocator.cc @@ -25,7 +25,6 @@ #include "register_allocator_linear_scan.h" #include "ssa_liveness_analysis.h" - namespace art { RegisterAllocator::RegisterAllocator(ArenaAllocator* allocator, diff --git a/compiler/optimizing/register_allocator_test.cc b/compiler/optimizing/register_allocator_test.cc index 24a2ab24d8..bcdd7f9cd8 100644 --- a/compiler/optimizing/register_allocator_test.cc +++ b/compiler/optimizing/register_allocator_test.cc @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "register_allocator.h" + #include "arch/x86/instruction_set_features_x86.h" #include "base/arena_allocator.h" #include "builder.h" @@ -25,7 +27,6 @@ #include "driver/compiler_options.h" #include "nodes.h" #include "optimizing_unit_test.h" -#include "register_allocator.h" #include "register_allocator_linear_scan.h" #include "ssa_liveness_analysis.h" #include "ssa_phi_elimination.h" diff --git a/compiler/optimizing/scheduler.h b/compiler/optimizing/scheduler.h index 930a2c82cf..66ffac5b7d 100644 --- a/compiler/optimizing/scheduler.h +++ b/compiler/optimizing/scheduler.h @@ -20,11 +20,11 @@ #include <fstream> #include "base/time_utils.h" +#include "code_generator.h" #include "driver/compiler_driver.h" #include "load_store_analysis.h" #include "nodes.h" #include "optimization.h" -#include "code_generator.h" namespace art { diff --git a/compiler/optimizing/scheduler_arm.cc b/compiler/optimizing/scheduler_arm.cc index f025c0a2d4..ea15790105 100644 --- a/compiler/optimizing/scheduler_arm.cc +++ b/compiler/optimizing/scheduler_arm.cc @@ -14,11 +14,12 @@ * limitations under the License. */ +#include "scheduler_arm.h" + #include "arch/arm/instruction_set_features_arm.h" #include "code_generator_utils.h" #include "common_arm.h" #include "mirror/array-inl.h" -#include "scheduler_arm.h" namespace art { namespace arm { diff --git a/compiler/optimizing/scheduler_arm64.cc b/compiler/optimizing/scheduler_arm64.cc index 83b487fb5b..f54d3f3de2 100644 --- a/compiler/optimizing/scheduler_arm64.cc +++ b/compiler/optimizing/scheduler_arm64.cc @@ -15,6 +15,7 @@ */ #include "scheduler_arm64.h" + #include "code_generator_utils.h" #include "mirror/array-inl.h" diff --git a/compiler/optimizing/scheduler_test.cc b/compiler/optimizing/scheduler_test.cc index 10c3cd7535..cdb6666f83 100644 --- a/compiler/optimizing/scheduler_test.cc +++ b/compiler/optimizing/scheduler_test.cc @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "scheduler.h" + #include "base/arena_allocator.h" #include "builder.h" #include "codegen_test_utils.h" @@ -23,7 +25,6 @@ #include "optimizing_unit_test.h" #include "pc_relative_fixups_x86.h" #include "register_allocator.h" -#include "scheduler.h" #ifdef ART_ENABLE_CODEGEN_arm64 #include "scheduler_arm64.h" diff --git a/compiler/optimizing/sharpening.cc b/compiler/optimizing/sharpening.cc index 8bd568befd..9536d149f6 100644 --- a/compiler/optimizing/sharpening.cc +++ b/compiler/optimizing/sharpening.cc @@ -21,10 +21,9 @@ #include "base/enums.h" #include "class_linker.h" #include "code_generator.h" +#include "driver/compiler_driver.h" #include "driver/compiler_options.h" #include "driver/dex_compilation_unit.h" -#include "utils/dex_cache_arrays_layout-inl.h" -#include "driver/compiler_driver.h" #include "gc/heap.h" #include "gc/space/image_space.h" #include "handle_scope-inl.h" @@ -33,6 +32,7 @@ #include "nodes.h" #include "runtime.h" #include "scoped_thread_state_change-inl.h" +#include "utils/dex_cache_arrays_layout-inl.h" namespace art { diff --git a/compiler/optimizing/ssa_liveness_analysis_test.cc b/compiler/optimizing/ssa_liveness_analysis_test.cc index 029eb4ba61..b46060a24a 100644 --- a/compiler/optimizing/ssa_liveness_analysis_test.cc +++ b/compiler/optimizing/ssa_liveness_analysis_test.cc @@ -14,15 +14,16 @@ * limitations under the License. */ +#include "ssa_liveness_analysis.h" + #include "arch/instruction_set.h" #include "arch/instruction_set_features.h" #include "base/arena_allocator.h" #include "base/arena_containers.h" -#include "driver/compiler_options.h" #include "code_generator.h" +#include "driver/compiler_options.h" #include "nodes.h" #include "optimizing_unit_test.h" -#include "ssa_liveness_analysis.h" namespace art { diff --git a/compiler/optimizing/ssa_phi_elimination.cc b/compiler/optimizing/ssa_phi_elimination.cc index aec7a3c555..b4f8408a76 100644 --- a/compiler/optimizing/ssa_phi_elimination.cc +++ b/compiler/optimizing/ssa_phi_elimination.cc @@ -16,8 +16,8 @@ #include "ssa_phi_elimination.h" -#include "base/arena_containers.h" #include "base/arena_bit_vector.h" +#include "base/arena_containers.h" #include "base/bit_vector-inl.h" namespace art { |