diff options
Diffstat (limited to 'compiler')
199 files changed, 321 insertions, 200 deletions
diff --git a/compiler/Android.bp b/compiler/Android.bp index dfd71f1bb2..8c85173614 100644 --- a/compiler/Android.bp +++ b/compiler/Android.bp @@ -457,13 +457,16 @@ art_cc_test { shared_libs: [ "libprofiled", - "libartd-compiler", "libartd-simulator-container", + "libartpalette", "libvixld", "libbacktrace", "libnativeloader", ], + static_libs: [ + "libartd-compiler", + ], target: { host: { @@ -511,7 +514,9 @@ art_cc_test { }, }, shared_libs: [ - "libartd-compiler", "libvixld", ], + static_libs: [ + "libartd-compiler", + ], } diff --git a/compiler/optimizing/block_builder.cc b/compiler/optimizing/block_builder.cc index a5f78cafe0..2cb2c68ad1 100644 --- a/compiler/optimizing/block_builder.cc +++ b/compiler/optimizing/block_builder.cc @@ -22,7 +22,7 @@ #include "dex/dex_file_exception_helpers.h" #include "quicken_info.h" -namespace art { +namespace art HIDDEN { HBasicBlockBuilder::HBasicBlockBuilder(HGraph* graph, const DexFile* const dex_file, diff --git a/compiler/optimizing/block_builder.h b/compiler/optimizing/block_builder.h index 2c1f034d80..99b3fc2be4 100644 --- a/compiler/optimizing/block_builder.h +++ b/compiler/optimizing/block_builder.h @@ -17,13 +17,14 @@ #ifndef ART_COMPILER_OPTIMIZING_BLOCK_BUILDER_H_ #define ART_COMPILER_OPTIMIZING_BLOCK_BUILDER_H_ +#include "base/macros.h" #include "base/scoped_arena_allocator.h" #include "base/scoped_arena_containers.h" #include "dex/code_item_accessors.h" #include "dex/dex_file.h" #include "nodes.h" -namespace art { +namespace art HIDDEN { class HBasicBlockBuilder : public ValueObject { public: diff --git a/compiler/optimizing/bounds_check_elimination.cc b/compiler/optimizing/bounds_check_elimination.cc index e35d50220e..b3f78fefea 100644 --- a/compiler/optimizing/bounds_check_elimination.cc +++ b/compiler/optimizing/bounds_check_elimination.cc @@ -24,7 +24,7 @@ #include "nodes.h" #include "side_effects_analysis.h" -namespace art { +namespace art HIDDEN { class MonotonicValueRange; diff --git a/compiler/optimizing/bounds_check_elimination.h b/compiler/optimizing/bounds_check_elimination.h index ef08877daa..f210fa9127 100644 --- a/compiler/optimizing/bounds_check_elimination.h +++ b/compiler/optimizing/bounds_check_elimination.h @@ -17,9 +17,10 @@ #ifndef ART_COMPILER_OPTIMIZING_BOUNDS_CHECK_ELIMINATION_H_ #define ART_COMPILER_OPTIMIZING_BOUNDS_CHECK_ELIMINATION_H_ +#include "base/macros.h" #include "optimization.h" -namespace art { +namespace art HIDDEN { class SideEffectsAnalysis; class HInductionVarAnalysis; diff --git a/compiler/optimizing/bounds_check_elimination_test.cc b/compiler/optimizing/bounds_check_elimination_test.cc index 5927d681b2..929a9e7fe7 100644 --- a/compiler/optimizing/bounds_check_elimination_test.cc +++ b/compiler/optimizing/bounds_check_elimination_test.cc @@ -17,6 +17,7 @@ #include "bounds_check_elimination.h" #include "base/arena_allocator.h" +#include "base/macros.h" #include "builder.h" #include "gvn.h" #include "induction_var_analysis.h" @@ -27,7 +28,7 @@ #include "gtest/gtest.h" -namespace art { +namespace art HIDDEN { /** * Fixture class for the BoundsCheckElimination tests. diff --git a/compiler/optimizing/builder.cc b/compiler/optimizing/builder.cc index 64aa1b9358..777799d343 100644 --- a/compiler/optimizing/builder.cc +++ b/compiler/optimizing/builder.cc @@ -35,7 +35,7 @@ #include "thread.h" #include "utils/dex_cache_arrays_layout-inl.h" -namespace art { +namespace art HIDDEN { HGraphBuilder::HGraphBuilder(HGraph* graph, const CodeItemDebugInfoAccessor& accessor, diff --git a/compiler/optimizing/builder.h b/compiler/optimizing/builder.h index 6152740324..dce3d9dc8e 100644 --- a/compiler/optimizing/builder.h +++ b/compiler/optimizing/builder.h @@ -19,12 +19,13 @@ #include "base/arena_object.h" #include "base/array_ref.h" +#include "base/macros.h" #include "dex/code_item_accessors.h" #include "dex/dex_file-inl.h" #include "dex/dex_file.h" #include "nodes.h" -namespace art { +namespace art HIDDEN { class ArtMethod; class CodeGenerator; diff --git a/compiler/optimizing/cha_guard_optimization.cc b/compiler/optimizing/cha_guard_optimization.cc index c6232ef661..09c012131b 100644 --- a/compiler/optimizing/cha_guard_optimization.cc +++ b/compiler/optimizing/cha_guard_optimization.cc @@ -16,7 +16,7 @@ #include "cha_guard_optimization.h" -namespace art { +namespace art HIDDEN { // Note we can only do CHA guard elimination/motion in a single pass, since // if a guard is not removed, another guard might be removed due to diff --git a/compiler/optimizing/cha_guard_optimization.h b/compiler/optimizing/cha_guard_optimization.h index 440d51a969..5c1fdd90de 100644 --- a/compiler/optimizing/cha_guard_optimization.h +++ b/compiler/optimizing/cha_guard_optimization.h @@ -17,9 +17,10 @@ #ifndef ART_COMPILER_OPTIMIZING_CHA_GUARD_OPTIMIZATION_H_ #define ART_COMPILER_OPTIMIZING_CHA_GUARD_OPTIMIZATION_H_ +#include "base/macros.h" #include "optimization.h" -namespace art { +namespace art HIDDEN { /** * Optimize CHA guards by removing/moving them. diff --git a/compiler/optimizing/code_generator.cc b/compiler/optimizing/code_generator.cc index bef7169da1..c217d3bc58 100644 --- a/compiler/optimizing/code_generator.cc +++ b/compiler/optimizing/code_generator.cc @@ -68,7 +68,7 @@ #include "thread-current-inl.h" #include "utils/assembler.h" -namespace art { +namespace art HIDDEN { // Return whether a location is consistent with a type. static bool CheckType(DataType::Type type, Location location) { diff --git a/compiler/optimizing/code_generator.h b/compiler/optimizing/code_generator.h index 9e3e454f3d..43e0615b61 100644 --- a/compiler/optimizing/code_generator.h +++ b/compiler/optimizing/code_generator.h @@ -26,6 +26,7 @@ #include "base/bit_utils.h" #include "base/enums.h" #include "base/globals.h" +#include "base/macros.h" #include "base/memory_region.h" #include "dex/string_reference.h" #include "dex/type_reference.h" @@ -37,7 +38,7 @@ #include "stack.h" #include "utils/label.h" -namespace art { +namespace art HIDDEN { // Binary encoding of 2^32 for type double. static int64_t constexpr k2Pow32EncodingForDouble = INT64_C(0x41F0000000000000); diff --git a/compiler/optimizing/code_generator_arm64.cc b/compiler/optimizing/code_generator_arm64.cc index 3a2988fbf5..8e862e88da 100644 --- a/compiler/optimizing/code_generator_arm64.cc +++ b/compiler/optimizing/code_generator_arm64.cc @@ -50,7 +50,7 @@ using vixl::EmissionCheckScope; #error "ARM64 Codegen VIXL macro-assembler macro already defined." #endif -namespace art { +namespace art HIDDEN { template<class MirrorType> class GcRoot; diff --git a/compiler/optimizing/code_generator_arm64.h b/compiler/optimizing/code_generator_arm64.h index 1a9b7006dc..9407669733 100644 --- a/compiler/optimizing/code_generator_arm64.h +++ b/compiler/optimizing/code_generator_arm64.h @@ -18,6 +18,7 @@ #define ART_COMPILER_OPTIMIZING_CODE_GENERATOR_ARM64_H_ #include "base/bit_field.h" +#include "base/macros.h" #include "code_generator.h" #include "common_arm64.h" #include "dex/dex_file_types.h" @@ -35,7 +36,7 @@ #include "aarch64/macro-assembler-aarch64.h" #pragma GCC diagnostic pop -namespace art { +namespace art HIDDEN { namespace linker { class Arm64RelativePatcherTest; diff --git a/compiler/optimizing/code_generator_arm_vixl.cc b/compiler/optimizing/code_generator_arm_vixl.cc index 1c69dd685b..060ee245b7 100644 --- a/compiler/optimizing/code_generator_arm_vixl.cc +++ b/compiler/optimizing/code_generator_arm_vixl.cc @@ -40,7 +40,7 @@ #include "utils/assembler.h" #include "utils/stack_checks.h" -namespace art { +namespace art HIDDEN { namespace arm { namespace vixl32 = vixl::aarch32; diff --git a/compiler/optimizing/code_generator_arm_vixl.h b/compiler/optimizing/code_generator_arm_vixl.h index fae615d030..662aba8ef1 100644 --- a/compiler/optimizing/code_generator_arm_vixl.h +++ b/compiler/optimizing/code_generator_arm_vixl.h @@ -18,6 +18,7 @@ #define ART_COMPILER_OPTIMIZING_CODE_GENERATOR_ARM_VIXL_H_ #include "base/enums.h" +#include "base/macros.h" #include "code_generator.h" #include "common_arm.h" #include "dex/string_reference.h" @@ -35,7 +36,7 @@ #include "aarch32/macro-assembler-aarch32.h" #pragma GCC diagnostic pop -namespace art { +namespace art HIDDEN { namespace linker { class Thumb2RelativePatcherTest; diff --git a/compiler/optimizing/code_generator_mips.cc b/compiler/optimizing/code_generator_mips.cc index dc657b6fb1..2dd2d32ff6 100644 --- a/compiler/optimizing/code_generator_mips.cc +++ b/compiler/optimizing/code_generator_mips.cc @@ -40,7 +40,7 @@ #include "utils/mips/assembler_mips.h" #include "utils/stack_checks.h" -namespace art { +namespace art HIDDEN { namespace mips { static constexpr int kCurrentMethodStackOffset = 0; diff --git a/compiler/optimizing/code_generator_mips.h b/compiler/optimizing/code_generator_mips.h index d6cefbc8d1..7c491afca9 100644 --- a/compiler/optimizing/code_generator_mips.h +++ b/compiler/optimizing/code_generator_mips.h @@ -17,6 +17,7 @@ #ifndef ART_COMPILER_OPTIMIZING_CODE_GENERATOR_MIPS_H_ #define ART_COMPILER_OPTIMIZING_CODE_GENERATOR_MIPS_H_ +#include "base/macros.h" #include "code_generator.h" #include "dex/dex_file_types.h" #include "dex/string_reference.h" @@ -26,7 +27,7 @@ #include "parallel_move_resolver.h" #include "utils/mips/assembler_mips.h" -namespace art { +namespace art HIDDEN { namespace mips { // InvokeDexCallingConvention registers diff --git a/compiler/optimizing/code_generator_mips64.cc b/compiler/optimizing/code_generator_mips64.cc index 75bca4ede3..9eff30d424 100644 --- a/compiler/optimizing/code_generator_mips64.cc +++ b/compiler/optimizing/code_generator_mips64.cc @@ -38,7 +38,7 @@ #include "utils/mips64/assembler_mips64.h" #include "utils/stack_checks.h" -namespace art { +namespace art HIDDEN { namespace mips64 { static constexpr int kCurrentMethodStackOffset = 0; diff --git a/compiler/optimizing/code_generator_mips64.h b/compiler/optimizing/code_generator_mips64.h index bbaebb503a..52da140933 100644 --- a/compiler/optimizing/code_generator_mips64.h +++ b/compiler/optimizing/code_generator_mips64.h @@ -17,6 +17,7 @@ #ifndef ART_COMPILER_OPTIMIZING_CODE_GENERATOR_MIPS64_H_ #define ART_COMPILER_OPTIMIZING_CODE_GENERATOR_MIPS64_H_ +#include "base/macros.h" #include "code_generator.h" #include "dex/type_reference.h" #include "driver/compiler_options.h" @@ -24,7 +25,7 @@ #include "parallel_move_resolver.h" #include "utils/mips64/assembler_mips64.h" -namespace art { +namespace art HIDDEN { namespace mips64 { // InvokeDexCallingConvention registers diff --git a/compiler/optimizing/code_generator_utils.cc b/compiler/optimizing/code_generator_utils.cc index dd47a1fc6c..6dec9684c9 100644 --- a/compiler/optimizing/code_generator_utils.cc +++ b/compiler/optimizing/code_generator_utils.cc @@ -20,7 +20,7 @@ #include "nodes.h" -namespace art { +namespace art HIDDEN { void CalculateMagicAndShiftForDivRem(int64_t divisor, bool is_long, int64_t* magic, int* shift) { diff --git a/compiler/optimizing/code_generator_utils.h b/compiler/optimizing/code_generator_utils.h index a6b41c0588..2afac2ff68 100644 --- a/compiler/optimizing/code_generator_utils.h +++ b/compiler/optimizing/code_generator_utils.h @@ -21,7 +21,9 @@ #include <cstdlib> #include <limits> -namespace art { +#include "base/macros.h" + +namespace art HIDDEN { class HInstruction; diff --git a/compiler/optimizing/code_generator_vector_arm64.cc b/compiler/optimizing/code_generator_vector_arm64.cc index df95c88c07..71c94fe50b 100644 --- a/compiler/optimizing/code_generator_vector_arm64.cc +++ b/compiler/optimizing/code_generator_vector_arm64.cc @@ -22,7 +22,7 @@ using namespace vixl::aarch64; // NOLINT(build/namespaces) -namespace art { +namespace art HIDDEN { namespace arm64 { using helpers::ARM64EncodableConstantOrRegister; diff --git a/compiler/optimizing/code_generator_vector_arm_vixl.cc b/compiler/optimizing/code_generator_vector_arm_vixl.cc index b092961a56..eb06a5db70 100644 --- a/compiler/optimizing/code_generator_vector_arm_vixl.cc +++ b/compiler/optimizing/code_generator_vector_arm_vixl.cc @@ -20,7 +20,7 @@ namespace vixl32 = vixl::aarch32; using namespace vixl32; // NOLINT(build/namespaces) -namespace art { +namespace art HIDDEN { namespace arm { using helpers::DRegisterFrom; diff --git a/compiler/optimizing/code_generator_vector_mips.cc b/compiler/optimizing/code_generator_vector_mips.cc index 4e9ba0d3d2..5a39c1b2df 100644 --- a/compiler/optimizing/code_generator_vector_mips.cc +++ b/compiler/optimizing/code_generator_vector_mips.cc @@ -17,7 +17,7 @@ #include "code_generator_mips.h" #include "mirror/array-inl.h" -namespace art { +namespace art HIDDEN { namespace mips { // NOLINT on __ macro to suppress wrong warning/fix (misc-macro-parentheses) from clang-tidy. diff --git a/compiler/optimizing/code_generator_vector_mips64.cc b/compiler/optimizing/code_generator_vector_mips64.cc index 6467d3e27f..12895f80e9 100644 --- a/compiler/optimizing/code_generator_vector_mips64.cc +++ b/compiler/optimizing/code_generator_vector_mips64.cc @@ -17,7 +17,7 @@ #include "code_generator_mips64.h" #include "mirror/array-inl.h" -namespace art { +namespace art HIDDEN { namespace mips64 { // NOLINT on __ macro to suppress wrong warning/fix (misc-macro-parentheses) from clang-tidy. diff --git a/compiler/optimizing/code_generator_vector_x86.cc b/compiler/optimizing/code_generator_vector_x86.cc index 68aef779f2..e2da8f8b42 100644 --- a/compiler/optimizing/code_generator_vector_x86.cc +++ b/compiler/optimizing/code_generator_vector_x86.cc @@ -19,7 +19,7 @@ #include "mirror/array-inl.h" #include "mirror/string.h" -namespace art { +namespace art HIDDEN { namespace x86 { // NOLINT on __ macro to suppress wrong warning/fix (misc-macro-parentheses) from clang-tidy. diff --git a/compiler/optimizing/code_generator_vector_x86_64.cc b/compiler/optimizing/code_generator_vector_x86_64.cc index 19dfd1d2a8..fdcba2fcd0 100644 --- a/compiler/optimizing/code_generator_vector_x86_64.cc +++ b/compiler/optimizing/code_generator_vector_x86_64.cc @@ -19,7 +19,7 @@ #include "mirror/array-inl.h" #include "mirror/string.h" -namespace art { +namespace art HIDDEN { namespace x86_64 { // NOLINT on __ macro to suppress wrong warning/fix (misc-macro-parentheses) from clang-tidy. diff --git a/compiler/optimizing/code_generator_x86.cc b/compiler/optimizing/code_generator_x86.cc index 797fe323d0..9e066b7f84 100644 --- a/compiler/optimizing/code_generator_x86.cc +++ b/compiler/optimizing/code_generator_x86.cc @@ -37,7 +37,7 @@ #include "utils/x86/assembler_x86.h" #include "utils/x86/managed_register_x86.h" -namespace art { +namespace art HIDDEN { template<class MirrorType> class GcRoot; diff --git a/compiler/optimizing/code_generator_x86.h b/compiler/optimizing/code_generator_x86.h index 6bf6b0b7b4..240f8d2816 100644 --- a/compiler/optimizing/code_generator_x86.h +++ b/compiler/optimizing/code_generator_x86.h @@ -19,6 +19,7 @@ #include "arch/x86/instruction_set_features_x86.h" #include "base/enums.h" +#include "base/macros.h" #include "code_generator.h" #include "dex/dex_file_types.h" #include "driver/compiler_options.h" @@ -26,7 +27,7 @@ #include "parallel_move_resolver.h" #include "utils/x86/assembler_x86.h" -namespace art { +namespace art HIDDEN { namespace x86 { // Use a local definition to prevent copying mistakes. diff --git a/compiler/optimizing/code_generator_x86_64.cc b/compiler/optimizing/code_generator_x86_64.cc index 2d51f3230f..e3b4e4066c 100644 --- a/compiler/optimizing/code_generator_x86_64.cc +++ b/compiler/optimizing/code_generator_x86_64.cc @@ -37,7 +37,7 @@ #include "utils/x86_64/assembler_x86_64.h" #include "utils/x86_64/managed_register_x86_64.h" -namespace art { +namespace art HIDDEN { template<class MirrorType> class GcRoot; diff --git a/compiler/optimizing/code_generator_x86_64.h b/compiler/optimizing/code_generator_x86_64.h index ef8f5ac36b..82bb2b2cb2 100644 --- a/compiler/optimizing/code_generator_x86_64.h +++ b/compiler/optimizing/code_generator_x86_64.h @@ -18,13 +18,14 @@ #define ART_COMPILER_OPTIMIZING_CODE_GENERATOR_X86_64_H_ #include "arch/x86_64/instruction_set_features_x86_64.h" +#include "base/macros.h" #include "code_generator.h" #include "driver/compiler_options.h" #include "nodes.h" #include "parallel_move_resolver.h" #include "utils/x86_64/assembler_x86_64.h" -namespace art { +namespace art HIDDEN { namespace x86_64 { // Use a local definition to prevent copying mistakes. diff --git a/compiler/optimizing/code_sinking.cc b/compiler/optimizing/code_sinking.cc index f406983fc2..0bb34dd84f 100644 --- a/compiler/optimizing/code_sinking.cc +++ b/compiler/optimizing/code_sinking.cc @@ -23,7 +23,7 @@ #include "common_dominator.h" #include "nodes.h" -namespace art { +namespace art HIDDEN { bool CodeSinking::Run() { HBasicBlock* exit = graph_->GetExitBlock(); diff --git a/compiler/optimizing/code_sinking.h b/compiler/optimizing/code_sinking.h index 8eb3a520c3..14f62f2417 100644 --- a/compiler/optimizing/code_sinking.h +++ b/compiler/optimizing/code_sinking.h @@ -17,10 +17,11 @@ #ifndef ART_COMPILER_OPTIMIZING_CODE_SINKING_H_ #define ART_COMPILER_OPTIMIZING_CODE_SINKING_H_ +#include "base/macros.h" #include "nodes.h" #include "optimization.h" -namespace art { +namespace art HIDDEN { /** * Optimization pass to move instructions into uncommon branches, diff --git a/compiler/optimizing/codegen_test.cc b/compiler/optimizing/codegen_test.cc index 26d07bd592..9949ef8089 100644 --- a/compiler/optimizing/codegen_test.cc +++ b/compiler/optimizing/codegen_test.cc @@ -35,7 +35,7 @@ #include "gtest/gtest.h" -namespace art { +namespace art HIDDEN { // Return all combinations of ISA and code generator that are executable on // hardware, or on simulator, and that we'd like to test. diff --git a/compiler/optimizing/codegen_test_utils.h b/compiler/optimizing/codegen_test_utils.h index dde39d46f3..470d115f2e 100644 --- a/compiler/optimizing/codegen_test_utils.h +++ b/compiler/optimizing/codegen_test_utils.h @@ -22,6 +22,7 @@ #include "arch/mips/registers_mips.h" #include "arch/mips64/registers_mips64.h" #include "arch/x86/registers_x86.h" +#include "base/macros.h" #include "code_simulator.h" #include "code_simulator_container.h" #include "common_compiler_test.h" @@ -53,7 +54,7 @@ #include "code_generator_mips64.h" #endif -namespace art { +namespace art HIDDEN { typedef CodeGenerator* (*CreateCodegenFn)(HGraph*, const CompilerOptions&); diff --git a/compiler/optimizing/common_arm.h b/compiler/optimizing/common_arm.h index 320915ee57..5f71cb906c 100644 --- a/compiler/optimizing/common_arm.h +++ b/compiler/optimizing/common_arm.h @@ -17,6 +17,7 @@ #ifndef ART_COMPILER_OPTIMIZING_COMMON_ARM_H_ #define ART_COMPILER_OPTIMIZING_COMMON_ARM_H_ +#include "base/macros.h" #include "instruction_simplifier_shared.h" #include "locations.h" #include "nodes.h" @@ -28,7 +29,7 @@ #include "aarch32/macro-assembler-aarch32.h" #pragma GCC diagnostic pop -namespace art { +namespace art HIDDEN { using helpers::HasShifterOperand; diff --git a/compiler/optimizing/common_arm64.h b/compiler/optimizing/common_arm64.h index 5556f16740..e29353db9c 100644 --- a/compiler/optimizing/common_arm64.h +++ b/compiler/optimizing/common_arm64.h @@ -17,6 +17,7 @@ #ifndef ART_COMPILER_OPTIMIZING_COMMON_ARM64_H_ #define ART_COMPILER_OPTIMIZING_COMMON_ARM64_H_ +#include "base/macros.h" #include "code_generator.h" #include "instruction_simplifier_shared.h" #include "locations.h" @@ -31,7 +32,7 @@ #include "aarch64/simulator-aarch64.h" #pragma GCC diagnostic pop -namespace art { +namespace art HIDDEN { using helpers::CanFitInShifterOperand; using helpers::HasShifterOperand; diff --git a/compiler/optimizing/common_dominator.h b/compiler/optimizing/common_dominator.h index 9f012cfbb2..f01270ee4a 100644 --- a/compiler/optimizing/common_dominator.h +++ b/compiler/optimizing/common_dominator.h @@ -17,9 +17,10 @@ #ifndef ART_COMPILER_OPTIMIZING_COMMON_DOMINATOR_H_ #define ART_COMPILER_OPTIMIZING_COMMON_DOMINATOR_H_ +#include "base/macros.h" #include "nodes.h" -namespace art { +namespace art HIDDEN { // Helper class for finding common dominators of two or more blocks in a graph. // The domination information of a graph must not be modified while there is diff --git a/compiler/optimizing/constant_folding.cc b/compiler/optimizing/constant_folding.cc index 2031707759..480fbabee0 100644 --- a/compiler/optimizing/constant_folding.cc +++ b/compiler/optimizing/constant_folding.cc @@ -16,7 +16,7 @@ #include "constant_folding.h" -namespace art { +namespace art HIDDEN { // This visitor tries to simplify instructions that can be evaluated // as constants. diff --git a/compiler/optimizing/constant_folding.h b/compiler/optimizing/constant_folding.h index 72bd95b3cb..6f3cf8a5b8 100644 --- a/compiler/optimizing/constant_folding.h +++ b/compiler/optimizing/constant_folding.h @@ -17,10 +17,11 @@ #ifndef ART_COMPILER_OPTIMIZING_CONSTANT_FOLDING_H_ #define ART_COMPILER_OPTIMIZING_CONSTANT_FOLDING_H_ +#include "base/macros.h" #include "nodes.h" #include "optimization.h" -namespace art { +namespace art HIDDEN { /** * Optimization pass performing a simple constant-expression diff --git a/compiler/optimizing/constant_folding_test.cc b/compiler/optimizing/constant_folding_test.cc index 74d9d3a993..2730fc7c82 100644 --- a/compiler/optimizing/constant_folding_test.cc +++ b/compiler/optimizing/constant_folding_test.cc @@ -17,6 +17,8 @@ #include <functional> #include "constant_folding.h" + +#include "base/macros.h" #include "dead_code_elimination.h" #include "driver/compiler_options.h" #include "graph_checker.h" @@ -25,7 +27,7 @@ #include "gtest/gtest.h" -namespace art { +namespace art HIDDEN { /** * Fixture class for the constant folding and dce tests. diff --git a/compiler/optimizing/constructor_fence_redundancy_elimination.cc b/compiler/optimizing/constructor_fence_redundancy_elimination.cc index 3a1a9e023d..e744797fa9 100644 --- a/compiler/optimizing/constructor_fence_redundancy_elimination.cc +++ b/compiler/optimizing/constructor_fence_redundancy_elimination.cc @@ -20,7 +20,7 @@ #include "base/scoped_arena_allocator.h" #include "base/scoped_arena_containers.h" -namespace art { +namespace art HIDDEN { static constexpr bool kCfreLogFenceInputCount = false; diff --git a/compiler/optimizing/constructor_fence_redundancy_elimination.h b/compiler/optimizing/constructor_fence_redundancy_elimination.h index 014b342258..e04b986171 100644 --- a/compiler/optimizing/constructor_fence_redundancy_elimination.h +++ b/compiler/optimizing/constructor_fence_redundancy_elimination.h @@ -17,9 +17,10 @@ #ifndef ART_COMPILER_OPTIMIZING_CONSTRUCTOR_FENCE_REDUNDANCY_ELIMINATION_H_ #define ART_COMPILER_OPTIMIZING_CONSTRUCTOR_FENCE_REDUNDANCY_ELIMINATION_H_ +#include "base/macros.h" #include "optimization.h" -namespace art { +namespace art HIDDEN { /* * Constructor Fence Redundancy Elimination (CFRE). diff --git a/compiler/optimizing/data_type-inl.h b/compiler/optimizing/data_type-inl.h index 94807e8fc9..81ce388505 100644 --- a/compiler/optimizing/data_type-inl.h +++ b/compiler/optimizing/data_type-inl.h @@ -20,7 +20,7 @@ #include "data_type.h" #include "dex/primitive.h" -namespace art { +namespace art HIDDEN { // Note: Not declared in data_type.h to avoid pulling in "primitive.h". constexpr DataType::Type DataTypeFromPrimitive(Primitive::Type type) { diff --git a/compiler/optimizing/data_type.cc b/compiler/optimizing/data_type.cc index cb354f46cc..183cf2c622 100644 --- a/compiler/optimizing/data_type.cc +++ b/compiler/optimizing/data_type.cc @@ -16,7 +16,7 @@ #include "data_type.h" -namespace art { +namespace art HIDDEN { static const char* kTypeNames[] = { "Reference", diff --git a/compiler/optimizing/data_type.h b/compiler/optimizing/data_type.h index 3cbcc9e0c3..19498fdd8a 100644 --- a/compiler/optimizing/data_type.h +++ b/compiler/optimizing/data_type.h @@ -22,8 +22,9 @@ #include <android-base/logging.h> #include "base/bit_utils.h" +#include "base/macros.h" -namespace art { +namespace art HIDDEN { class DataType { public: diff --git a/compiler/optimizing/data_type_test.cc b/compiler/optimizing/data_type_test.cc index 8fea22bce8..f6f614d8c4 100644 --- a/compiler/optimizing/data_type_test.cc +++ b/compiler/optimizing/data_type_test.cc @@ -22,7 +22,7 @@ #include "base/macros.h" #include "dex/primitive.h" -namespace art { +namespace art HIDDEN { template <DataType::Type data_type, Primitive::Type primitive_type> static void CheckConversion() { diff --git a/compiler/optimizing/dead_code_elimination.cc b/compiler/optimizing/dead_code_elimination.cc index 1dc10948cc..2e47356034 100644 --- a/compiler/optimizing/dead_code_elimination.cc +++ b/compiler/optimizing/dead_code_elimination.cc @@ -23,7 +23,7 @@ #include "base/stl_util.h" #include "ssa_phi_elimination.h" -namespace art { +namespace art HIDDEN { static void MarkReachableBlocks(HGraph* graph, ArenaBitVector* visited) { // Use local allocator for allocating memory. diff --git a/compiler/optimizing/dead_code_elimination.h b/compiler/optimizing/dead_code_elimination.h index 799721acf2..a3e993c1d7 100644 --- a/compiler/optimizing/dead_code_elimination.h +++ b/compiler/optimizing/dead_code_elimination.h @@ -17,11 +17,12 @@ #ifndef ART_COMPILER_OPTIMIZING_DEAD_CODE_ELIMINATION_H_ #define ART_COMPILER_OPTIMIZING_DEAD_CODE_ELIMINATION_H_ +#include "base/macros.h" #include "nodes.h" #include "optimization.h" #include "optimizing_compiler_stats.h" -namespace art { +namespace art HIDDEN { /** * Optimization pass performing dead code elimination (removal of diff --git a/compiler/optimizing/dead_code_elimination_test.cc b/compiler/optimizing/dead_code_elimination_test.cc index f5cd4dc27a..fcf4ca39f2 100644 --- a/compiler/optimizing/dead_code_elimination_test.cc +++ b/compiler/optimizing/dead_code_elimination_test.cc @@ -16,6 +16,7 @@ #include "dead_code_elimination.h" +#include "base/macros.h" #include "driver/compiler_options.h" #include "graph_checker.h" #include "optimizing_unit_test.h" @@ -23,7 +24,7 @@ #include "gtest/gtest.h" -namespace art { +namespace art HIDDEN { class DeadCodeEliminationTest : public OptimizingUnitTest { protected: diff --git a/compiler/optimizing/dominator_test.cc b/compiler/optimizing/dominator_test.cc index 1d72ba116e..d3b8cb1cf8 100644 --- a/compiler/optimizing/dominator_test.cc +++ b/compiler/optimizing/dominator_test.cc @@ -15,6 +15,7 @@ */ #include "base/arena_allocator.h" +#include "base/macros.h" #include "builder.h" #include "dex/dex_instruction.h" #include "nodes.h" @@ -22,7 +23,7 @@ #include "gtest/gtest.h" -namespace art { +namespace art HIDDEN { class OptimizerTest : public OptimizingUnitTest { protected: diff --git a/compiler/optimizing/emit_swap_mips_test.cc b/compiler/optimizing/emit_swap_mips_test.cc index 63a370a47b..f8578abdf3 100644 --- a/compiler/optimizing/emit_swap_mips_test.cc +++ b/compiler/optimizing/emit_swap_mips_test.cc @@ -15,6 +15,7 @@ */ #include "base/arena_allocator.h" +#include "base/macros.h" #include "code_generator_mips.h" #include "optimizing_unit_test.h" #include "parallel_move_resolver.h" @@ -23,7 +24,7 @@ #include "gtest/gtest.h" -namespace art { +namespace art HIDDEN { class EmitSwapMipsTest : public OptimizingUnitTest { public: diff --git a/compiler/optimizing/escape.cc b/compiler/optimizing/escape.cc index 2b578c1cc8..8616ac0f1e 100644 --- a/compiler/optimizing/escape.cc +++ b/compiler/optimizing/escape.cc @@ -18,7 +18,7 @@ #include "nodes.h" -namespace art { +namespace art HIDDEN { void CalculateEscape(HInstruction* reference, bool (*no_escape)(HInstruction*, HInstruction*), diff --git a/compiler/optimizing/escape.h b/compiler/optimizing/escape.h index 75e37b0551..17c0b928cf 100644 --- a/compiler/optimizing/escape.h +++ b/compiler/optimizing/escape.h @@ -17,7 +17,9 @@ #ifndef ART_COMPILER_OPTIMIZING_ESCAPE_H_ #define ART_COMPILER_OPTIMIZING_ESCAPE_H_ -namespace art { +#include "base/macros.h" + +namespace art HIDDEN { class HInstruction; diff --git a/compiler/optimizing/find_loops_test.cc b/compiler/optimizing/find_loops_test.cc index 75b8e9609e..8d8c3a1838 100644 --- a/compiler/optimizing/find_loops_test.cc +++ b/compiler/optimizing/find_loops_test.cc @@ -15,6 +15,7 @@ */ #include "base/arena_allocator.h" +#include "base/macros.h" #include "builder.h" #include "dex/dex_file.h" #include "dex/dex_instruction.h" @@ -25,7 +26,7 @@ #include "gtest/gtest.h" -namespace art { +namespace art HIDDEN { class FindLoopsTest : public OptimizingUnitTest {}; diff --git a/compiler/optimizing/graph_checker.cc b/compiler/optimizing/graph_checker.cc index 01d9603802..1555e1855f 100644 --- a/compiler/optimizing/graph_checker.cc +++ b/compiler/optimizing/graph_checker.cc @@ -31,7 +31,7 @@ #include "scoped_thread_state_change-inl.h" #include "subtype_check.h" -namespace art { +namespace art HIDDEN { using android::base::StringPrintf; diff --git a/compiler/optimizing/graph_checker.h b/compiler/optimizing/graph_checker.h index d085609197..a00cb2b146 100644 --- a/compiler/optimizing/graph_checker.h +++ b/compiler/optimizing/graph_checker.h @@ -21,10 +21,11 @@ #include "base/arena_bit_vector.h" #include "base/bit_vector-inl.h" +#include "base/macros.h" #include "base/scoped_arena_allocator.h" #include "nodes.h" -namespace art { +namespace art HIDDEN { // A control-flow graph visitor performing various checks. class GraphChecker : public HGraphDelegateVisitor { diff --git a/compiler/optimizing/graph_checker_test.cc b/compiler/optimizing/graph_checker_test.cc index 08bfa5d80f..9a2fc890f5 100644 --- a/compiler/optimizing/graph_checker_test.cc +++ b/compiler/optimizing/graph_checker_test.cc @@ -14,10 +14,11 @@ * limitations under the License. */ +#include "base/macros.h" #include "graph_checker.h" #include "optimizing_unit_test.h" -namespace art { +namespace art HIDDEN { class GraphCheckerTest : public OptimizingUnitTest { protected: diff --git a/compiler/optimizing/graph_test.cc b/compiler/optimizing/graph_test.cc index 29af808731..b5d712736f 100644 --- a/compiler/optimizing/graph_test.cc +++ b/compiler/optimizing/graph_test.cc @@ -15,6 +15,7 @@ */ #include "base/arena_allocator.h" +#include "base/macros.h" #include "builder.h" #include "nodes.h" #include "optimizing_unit_test.h" @@ -22,7 +23,7 @@ #include "gtest/gtest.h" -namespace art { +namespace art HIDDEN { class GraphTest : public OptimizingUnitTest { protected: diff --git a/compiler/optimizing/graph_visualizer.cc b/compiler/optimizing/graph_visualizer.cc index 9419c8dcf4..601bebd475 100644 --- a/compiler/optimizing/graph_visualizer.cc +++ b/compiler/optimizing/graph_visualizer.cc @@ -40,7 +40,7 @@ #include "ssa_liveness_analysis.h" #include "utils/assembler.h" -namespace art { +namespace art HIDDEN { static bool HasWhitespace(const char* str) { DCHECK(str != nullptr); diff --git a/compiler/optimizing/graph_visualizer.h b/compiler/optimizing/graph_visualizer.h index 66588f6e36..ec636d8c0b 100644 --- a/compiler/optimizing/graph_visualizer.h +++ b/compiler/optimizing/graph_visualizer.h @@ -21,9 +21,10 @@ #include "arch/instruction_set.h" #include "base/arena_containers.h" +#include "base/macros.h" #include "base/value_object.h" -namespace art { +namespace art HIDDEN { class CodeGenerator; class DexCompilationUnit; diff --git a/compiler/optimizing/gvn.cc b/compiler/optimizing/gvn.cc index e8460a843f..8d462863ba 100644 --- a/compiler/optimizing/gvn.cc +++ b/compiler/optimizing/gvn.cc @@ -23,7 +23,7 @@ #include "base/utils.h" #include "side_effects_analysis.h" -namespace art { +namespace art HIDDEN { /** * A ValueSet holds instructions that can replace other instructions. It is updated diff --git a/compiler/optimizing/gvn.h b/compiler/optimizing/gvn.h index bbf2265e98..df4e3a8dbf 100644 --- a/compiler/optimizing/gvn.h +++ b/compiler/optimizing/gvn.h @@ -17,10 +17,11 @@ #ifndef ART_COMPILER_OPTIMIZING_GVN_H_ #define ART_COMPILER_OPTIMIZING_GVN_H_ +#include "base/macros.h" #include "nodes.h" #include "optimization.h" -namespace art { +namespace art HIDDEN { class SideEffectsAnalysis; diff --git a/compiler/optimizing/gvn_test.cc b/compiler/optimizing/gvn_test.cc index 3bf4cc35ba..1eb6307cb1 100644 --- a/compiler/optimizing/gvn_test.cc +++ b/compiler/optimizing/gvn_test.cc @@ -17,12 +17,13 @@ #include "gvn.h" #include "base/arena_allocator.h" +#include "base/macros.h" #include "builder.h" #include "nodes.h" #include "optimizing_unit_test.h" #include "side_effects_analysis.h" -namespace art { +namespace art HIDDEN { class GVNTest : public OptimizingUnitTest {}; diff --git a/compiler/optimizing/induction_var_analysis.cc b/compiler/optimizing/induction_var_analysis.cc index 3a10d5831d..96f1342e28 100644 --- a/compiler/optimizing/induction_var_analysis.cc +++ b/compiler/optimizing/induction_var_analysis.cc @@ -17,7 +17,7 @@ #include "induction_var_analysis.h" #include "induction_var_range.h" -namespace art { +namespace art HIDDEN { /** * Since graph traversal may enter a SCC at any position, an initial representation may be rotated, diff --git a/compiler/optimizing/induction_var_analysis.h b/compiler/optimizing/induction_var_analysis.h index a48aa90059..2279cd00d2 100644 --- a/compiler/optimizing/induction_var_analysis.h +++ b/compiler/optimizing/induction_var_analysis.h @@ -19,10 +19,11 @@ #include <string> +#include "base/macros.h" #include "nodes.h" #include "optimization.h" -namespace art { +namespace art HIDDEN { /** * Induction variable analysis. This class does not have a direct public API. diff --git a/compiler/optimizing/induction_var_analysis_test.cc b/compiler/optimizing/induction_var_analysis_test.cc index 4c11ad4643..80c15371dc 100644 --- a/compiler/optimizing/induction_var_analysis_test.cc +++ b/compiler/optimizing/induction_var_analysis_test.cc @@ -17,12 +17,13 @@ #include <regex> #include "base/arena_allocator.h" +#include "base/macros.h" #include "builder.h" #include "induction_var_analysis.h" #include "nodes.h" #include "optimizing_unit_test.h" -namespace art { +namespace art HIDDEN { /** * Fixture class for the InductionVarAnalysis tests. diff --git a/compiler/optimizing/induction_var_range.cc b/compiler/optimizing/induction_var_range.cc index 4c78fa8f06..4cf1c861b5 100644 --- a/compiler/optimizing/induction_var_range.cc +++ b/compiler/optimizing/induction_var_range.cc @@ -18,7 +18,7 @@ #include <limits> -namespace art { +namespace art HIDDEN { /** Returns true if 64-bit constant fits in 32-bit constant. */ static bool CanLongValueFitIntoInt(int64_t c) { diff --git a/compiler/optimizing/induction_var_range.h b/compiler/optimizing/induction_var_range.h index 906dc6bb7b..dc1814b56f 100644 --- a/compiler/optimizing/induction_var_range.h +++ b/compiler/optimizing/induction_var_range.h @@ -17,9 +17,10 @@ #ifndef ART_COMPILER_OPTIMIZING_INDUCTION_VAR_RANGE_H_ #define ART_COMPILER_OPTIMIZING_INDUCTION_VAR_RANGE_H_ +#include "base/macros.h" #include "induction_var_analysis.h" -namespace art { +namespace art HIDDEN { /** * This class implements range analysis on expressions within loops. It takes the results diff --git a/compiler/optimizing/induction_var_range_test.cc b/compiler/optimizing/induction_var_range_test.cc index f6af384af0..0d04431762 100644 --- a/compiler/optimizing/induction_var_range_test.cc +++ b/compiler/optimizing/induction_var_range_test.cc @@ -17,12 +17,13 @@ #include "induction_var_range.h" #include "base/arena_allocator.h" +#include "base/macros.h" #include "builder.h" #include "induction_var_analysis.h" #include "nodes.h" #include "optimizing_unit_test.h" -namespace art { +namespace art HIDDEN { using Value = InductionVarRange::Value; diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc index ff7ed349a3..3b240d5eef 100644 --- a/compiler/optimizing/inliner.cc +++ b/compiler/optimizing/inliner.cc @@ -47,7 +47,7 @@ #include "ssa_phi_elimination.h" #include "thread.h" -namespace art { +namespace art HIDDEN { // Instruction limit to control memory. static constexpr size_t kMaximumNumberOfTotalInstructions = 1024; diff --git a/compiler/optimizing/inliner.h b/compiler/optimizing/inliner.h index 15d7349694..8be5b63ac6 100644 --- a/compiler/optimizing/inliner.h +++ b/compiler/optimizing/inliner.h @@ -17,12 +17,13 @@ #ifndef ART_COMPILER_OPTIMIZING_INLINER_H_ #define ART_COMPILER_OPTIMIZING_INLINER_H_ +#include "base/macros.h" #include "dex/dex_file_types.h" #include "dex/invoke_type.h" #include "optimization.h" #include "profile/profile_compilation_info.h" -namespace art { +namespace art HIDDEN { class CodeGenerator; class DexCompilationUnit; diff --git a/compiler/optimizing/instruction_builder.cc b/compiler/optimizing/instruction_builder.cc index e7f0872c65..f909a998ff 100644 --- a/compiler/optimizing/instruction_builder.cc +++ b/compiler/optimizing/instruction_builder.cc @@ -39,7 +39,7 @@ #include "ssa_builder.h" #include "well_known_classes.h" -namespace art { +namespace art HIDDEN { HInstructionBuilder::HInstructionBuilder(HGraph* graph, HBasicBlockBuilder* block_builder, diff --git a/compiler/optimizing/instruction_builder.h b/compiler/optimizing/instruction_builder.h index d701445946..be1706a44d 100644 --- a/compiler/optimizing/instruction_builder.h +++ b/compiler/optimizing/instruction_builder.h @@ -18,6 +18,7 @@ #define ART_COMPILER_OPTIMIZING_INSTRUCTION_BUILDER_H_ #include "base/array_ref.h" +#include "base/macros.h" #include "base/scoped_arena_allocator.h" #include "base/scoped_arena_containers.h" #include "data_type.h" @@ -28,7 +29,7 @@ #include "nodes.h" #include "quicken_info.h" -namespace art { +namespace art HIDDEN { class ArenaBitVector; class ArtField; diff --git a/compiler/optimizing/instruction_simplifier.cc b/compiler/optimizing/instruction_simplifier.cc index 63c5965415..7c1ef302db 100644 --- a/compiler/optimizing/instruction_simplifier.cc +++ b/compiler/optimizing/instruction_simplifier.cc @@ -27,7 +27,7 @@ #include "sharpening.h" #include "string_builder_append.h" -namespace art { +namespace art HIDDEN { // Whether to run an exhaustive test of individual HInstructions cloning when each instruction // is replaced with its copy if it is clonable. diff --git a/compiler/optimizing/instruction_simplifier.h b/compiler/optimizing/instruction_simplifier.h index 982a24a6f0..2d2d9921b1 100644 --- a/compiler/optimizing/instruction_simplifier.h +++ b/compiler/optimizing/instruction_simplifier.h @@ -17,11 +17,12 @@ #ifndef ART_COMPILER_OPTIMIZING_INSTRUCTION_SIMPLIFIER_H_ #define ART_COMPILER_OPTIMIZING_INSTRUCTION_SIMPLIFIER_H_ +#include "base/macros.h" #include "nodes.h" #include "optimization.h" #include "optimizing_compiler_stats.h" -namespace art { +namespace art HIDDEN { class CodeGenerator; diff --git a/compiler/optimizing/instruction_simplifier_arm.cc b/compiler/optimizing/instruction_simplifier_arm.cc index 01e9cff6d8..63ce667790 100644 --- a/compiler/optimizing/instruction_simplifier_arm.cc +++ b/compiler/optimizing/instruction_simplifier_arm.cc @@ -23,7 +23,7 @@ #include "mirror/string.h" #include "nodes.h" -namespace art { +namespace art HIDDEN { using helpers::CanFitInShifterOperand; using helpers::HasShifterOperand; diff --git a/compiler/optimizing/instruction_simplifier_arm.h b/compiler/optimizing/instruction_simplifier_arm.h index fca9341d59..0517e4f49e 100644 --- a/compiler/optimizing/instruction_simplifier_arm.h +++ b/compiler/optimizing/instruction_simplifier_arm.h @@ -17,10 +17,11 @@ #ifndef ART_COMPILER_OPTIMIZING_INSTRUCTION_SIMPLIFIER_ARM_H_ #define ART_COMPILER_OPTIMIZING_INSTRUCTION_SIMPLIFIER_ARM_H_ +#include "base/macros.h" #include "nodes.h" #include "optimization.h" -namespace art { +namespace art HIDDEN { namespace arm { class InstructionSimplifierArm : public HOptimization { diff --git a/compiler/optimizing/instruction_simplifier_arm64.cc b/compiler/optimizing/instruction_simplifier_arm64.cc index e23decbd71..3cdde98aaa 100644 --- a/compiler/optimizing/instruction_simplifier_arm64.cc +++ b/compiler/optimizing/instruction_simplifier_arm64.cc @@ -21,7 +21,7 @@ #include "mirror/array-inl.h" #include "mirror/string.h" -namespace art { +namespace art HIDDEN { using helpers::CanFitInShifterOperand; using helpers::HasShifterOperand; diff --git a/compiler/optimizing/instruction_simplifier_arm64.h b/compiler/optimizing/instruction_simplifier_arm64.h index 8d93c01ebf..374638ab9e 100644 --- a/compiler/optimizing/instruction_simplifier_arm64.h +++ b/compiler/optimizing/instruction_simplifier_arm64.h @@ -17,10 +17,11 @@ #ifndef ART_COMPILER_OPTIMIZING_INSTRUCTION_SIMPLIFIER_ARM64_H_ #define ART_COMPILER_OPTIMIZING_INSTRUCTION_SIMPLIFIER_ARM64_H_ +#include "base/macros.h" #include "nodes.h" #include "optimization.h" -namespace art { +namespace art HIDDEN { namespace arm64 { class InstructionSimplifierArm64 : public HOptimization { diff --git a/compiler/optimizing/instruction_simplifier_mips.cc b/compiler/optimizing/instruction_simplifier_mips.cc index 5d0c63b76b..70558df7d6 100644 --- a/compiler/optimizing/instruction_simplifier_mips.cc +++ b/compiler/optimizing/instruction_simplifier_mips.cc @@ -19,7 +19,7 @@ #include "arch/mips/instruction_set_features_mips.h" #include "mirror/array-inl.h" -namespace art { +namespace art HIDDEN { namespace mips { class InstructionSimplifierMipsVisitor : public HGraphVisitor { diff --git a/compiler/optimizing/instruction_simplifier_mips.h b/compiler/optimizing/instruction_simplifier_mips.h index b431334811..6147108653 100644 --- a/compiler/optimizing/instruction_simplifier_mips.h +++ b/compiler/optimizing/instruction_simplifier_mips.h @@ -17,11 +17,12 @@ #ifndef ART_COMPILER_OPTIMIZING_INSTRUCTION_SIMPLIFIER_MIPS_H_ #define ART_COMPILER_OPTIMIZING_INSTRUCTION_SIMPLIFIER_MIPS_H_ +#include "base/macros.h" #include "nodes.h" #include "optimization.h" #include "code_generator_mips.h" -namespace art { +namespace art HIDDEN { class CodeGenerator; diff --git a/compiler/optimizing/instruction_simplifier_shared.cc b/compiler/optimizing/instruction_simplifier_shared.cc index 0f30f662cd..d0d1f7a18e 100644 --- a/compiler/optimizing/instruction_simplifier_shared.cc +++ b/compiler/optimizing/instruction_simplifier_shared.cc @@ -18,7 +18,7 @@ #include "mirror/array-inl.h" -namespace art { +namespace art HIDDEN { namespace { diff --git a/compiler/optimizing/instruction_simplifier_shared.h b/compiler/optimizing/instruction_simplifier_shared.h index 758fc7663d..44056c5378 100644 --- a/compiler/optimizing/instruction_simplifier_shared.h +++ b/compiler/optimizing/instruction_simplifier_shared.h @@ -17,9 +17,10 @@ #ifndef ART_COMPILER_OPTIMIZING_INSTRUCTION_SIMPLIFIER_SHARED_H_ #define ART_COMPILER_OPTIMIZING_INSTRUCTION_SIMPLIFIER_SHARED_H_ +#include "base/macros.h" #include "nodes.h" -namespace art { +namespace art HIDDEN { namespace helpers { diff --git a/compiler/optimizing/instruction_simplifier_x86.cc b/compiler/optimizing/instruction_simplifier_x86.cc index 2d8f94a85b..805dd49644 100644 --- a/compiler/optimizing/instruction_simplifier_x86.cc +++ b/compiler/optimizing/instruction_simplifier_x86.cc @@ -17,7 +17,7 @@ #include "instruction_simplifier_x86_shared.h" #include "code_generator_x86.h" -namespace art { +namespace art HIDDEN { namespace x86 { diff --git a/compiler/optimizing/instruction_simplifier_x86.h b/compiler/optimizing/instruction_simplifier_x86.h index 6f10006db2..25ebe203b8 100644 --- a/compiler/optimizing/instruction_simplifier_x86.h +++ b/compiler/optimizing/instruction_simplifier_x86.h @@ -16,10 +16,11 @@ #ifndef ART_COMPILER_OPTIMIZING_INSTRUCTION_SIMPLIFIER_X86_H_ #define ART_COMPILER_OPTIMIZING_INSTRUCTION_SIMPLIFIER_X86_H_ +#include "base/macros.h" #include "nodes.h" #include "optimization.h" -namespace art { +namespace art HIDDEN { class CodeGenerator; namespace x86 { diff --git a/compiler/optimizing/instruction_simplifier_x86_64.cc b/compiler/optimizing/instruction_simplifier_x86_64.cc index 56c6b414d7..b783918879 100644 --- a/compiler/optimizing/instruction_simplifier_x86_64.cc +++ b/compiler/optimizing/instruction_simplifier_x86_64.cc @@ -17,7 +17,7 @@ #include "instruction_simplifier_x86_shared.h" #include "code_generator_x86_64.h" -namespace art { +namespace art HIDDEN { namespace x86_64 { diff --git a/compiler/optimizing/instruction_simplifier_x86_64.h b/compiler/optimizing/instruction_simplifier_x86_64.h index 6cae24d11a..1654dc4774 100644 --- a/compiler/optimizing/instruction_simplifier_x86_64.h +++ b/compiler/optimizing/instruction_simplifier_x86_64.h @@ -16,10 +16,11 @@ #ifndef ART_COMPILER_OPTIMIZING_INSTRUCTION_SIMPLIFIER_X86_64_H_ #define ART_COMPILER_OPTIMIZING_INSTRUCTION_SIMPLIFIER_X86_64_H_ +#include "base/macros.h" #include "nodes.h" #include "optimization.h" -namespace art { +namespace art HIDDEN { class CodeGenerator; diff --git a/compiler/optimizing/instruction_simplifier_x86_shared.cc b/compiler/optimizing/instruction_simplifier_x86_shared.cc index 2805abb2bb..74c5ca2466 100644 --- a/compiler/optimizing/instruction_simplifier_x86_shared.cc +++ b/compiler/optimizing/instruction_simplifier_x86_shared.cc @@ -14,9 +14,10 @@ */ #include "instruction_simplifier_x86_shared.h" + #include "nodes_x86.h" -namespace art { +namespace art HIDDEN { bool TryCombineAndNot(HAnd* instruction) { DataType::Type type = instruction->GetType(); diff --git a/compiler/optimizing/instruction_simplifier_x86_shared.h b/compiler/optimizing/instruction_simplifier_x86_shared.h index 7f94d7ea4c..1a44d0fdb5 100644 --- a/compiler/optimizing/instruction_simplifier_x86_shared.h +++ b/compiler/optimizing/instruction_simplifier_x86_shared.h @@ -16,13 +16,16 @@ #ifndef ART_COMPILER_OPTIMIZING_INSTRUCTION_SIMPLIFIER_X86_SHARED_H_ #define ART_COMPILER_OPTIMIZING_INSTRUCTION_SIMPLIFIER_X86_SHARED_H_ +#include "base/macros.h" #include "nodes.h" -namespace art { +namespace art HIDDEN { + bool TryCombineAndNot(HAnd* instruction); bool TryGenerateResetLeastSetBit(HAnd* instruction); bool TryGenerateMaskUptoLeastSetBit(HXor* instruction); bool AreLeastSetBitInputs(HInstruction* to_test, HInstruction* other); + } // namespace art #endif // ART_COMPILER_OPTIMIZING_INSTRUCTION_SIMPLIFIER_X86_SHARED_H_ diff --git a/compiler/optimizing/intrinsic_objects.h b/compiler/optimizing/intrinsic_objects.h index ed764bd4b2..e197e01a1a 100644 --- a/compiler/optimizing/intrinsic_objects.h +++ b/compiler/optimizing/intrinsic_objects.h @@ -21,6 +21,8 @@ #include "base/bit_utils.h" #include "base/mutex.h" +// TODO(b/142365358): Mark namespace as HIDDEN and functions used by dex2oat with EXPORT. +// Refactor the code to reduce the number of functions needed by dex2oat. namespace art { class ClassLinker; diff --git a/compiler/optimizing/intrinsics.cc b/compiler/optimizing/intrinsics.cc index d9401050df..209d171864 100644 --- a/compiler/optimizing/intrinsics.cc +++ b/compiler/optimizing/intrinsics.cc @@ -31,7 +31,7 @@ #include "scoped_thread_state_change-inl.h" #include "thread-current-inl.h" -namespace art { +namespace art HIDDEN { std::ostream& operator<<(std::ostream& os, const Intrinsics& intrinsic) { switch (intrinsic) { diff --git a/compiler/optimizing/intrinsics.h b/compiler/optimizing/intrinsics.h index ab68cce304..a33ed8b4fe 100644 --- a/compiler/optimizing/intrinsics.h +++ b/compiler/optimizing/intrinsics.h @@ -17,12 +17,13 @@ #ifndef ART_COMPILER_OPTIMIZING_INTRINSICS_H_ #define ART_COMPILER_OPTIMIZING_INTRINSICS_H_ +#include "base/macros.h" #include "code_generator.h" #include "nodes.h" #include "optimization.h" #include "parallel_move_resolver.h" -namespace art { +namespace art HIDDEN { class DexFile; diff --git a/compiler/optimizing/intrinsics_arm64.cc b/compiler/optimizing/intrinsics_arm64.cc index 185d487dff..8a2e8f6778 100644 --- a/compiler/optimizing/intrinsics_arm64.cc +++ b/compiler/optimizing/intrinsics_arm64.cc @@ -41,7 +41,7 @@ using namespace vixl::aarch64; // NOLINT(build/namespaces) #include "aarch64/macro-assembler-aarch64.h" #pragma GCC diagnostic pop -namespace art { +namespace art HIDDEN { namespace arm64 { diff --git a/compiler/optimizing/intrinsics_arm64.h b/compiler/optimizing/intrinsics_arm64.h index 9c46efddec..a0ccf87f7b 100644 --- a/compiler/optimizing/intrinsics_arm64.h +++ b/compiler/optimizing/intrinsics_arm64.h @@ -17,6 +17,7 @@ #ifndef ART_COMPILER_OPTIMIZING_INTRINSICS_ARM64_H_ #define ART_COMPILER_OPTIMIZING_INTRINSICS_ARM64_H_ +#include "base/macros.h" #include "intrinsics.h" namespace vixl { @@ -27,7 +28,7 @@ class MacroAssembler; } // namespace aarch64 } // namespace vixl -namespace art { +namespace art HIDDEN { class ArenaAllocator; class HInvokeStaticOrDirect; diff --git a/compiler/optimizing/intrinsics_arm_vixl.cc b/compiler/optimizing/intrinsics_arm_vixl.cc index 65f388837d..5993b05223 100644 --- a/compiler/optimizing/intrinsics_arm_vixl.cc +++ b/compiler/optimizing/intrinsics_arm_vixl.cc @@ -31,7 +31,7 @@ #include "aarch32/constants-aarch32.h" -namespace art { +namespace art HIDDEN { namespace arm { #define __ assembler->GetVIXLAssembler()-> diff --git a/compiler/optimizing/intrinsics_arm_vixl.h b/compiler/optimizing/intrinsics_arm_vixl.h index 1fea776f0d..bd1008d3a7 100644 --- a/compiler/optimizing/intrinsics_arm_vixl.h +++ b/compiler/optimizing/intrinsics_arm_vixl.h @@ -17,10 +17,11 @@ #ifndef ART_COMPILER_OPTIMIZING_INTRINSICS_ARM_VIXL_H_ #define ART_COMPILER_OPTIMIZING_INTRINSICS_ARM_VIXL_H_ +#include "base/macros.h" #include "intrinsics.h" #include "utils/arm/assembler_arm_vixl.h" -namespace art { +namespace art HIDDEN { namespace arm { diff --git a/compiler/optimizing/intrinsics_mips.cc b/compiler/optimizing/intrinsics_mips.cc index f71d281d5a..108f5ce429 100644 --- a/compiler/optimizing/intrinsics_mips.cc +++ b/compiler/optimizing/intrinsics_mips.cc @@ -30,7 +30,7 @@ #include "utils/mips/assembler_mips.h" #include "utils/mips/constants_mips.h" -namespace art { +namespace art HIDDEN { namespace mips { diff --git a/compiler/optimizing/intrinsics_mips.h b/compiler/optimizing/intrinsics_mips.h index 08d4e82139..efc349caed 100644 --- a/compiler/optimizing/intrinsics_mips.h +++ b/compiler/optimizing/intrinsics_mips.h @@ -17,9 +17,10 @@ #ifndef ART_COMPILER_OPTIMIZING_INTRINSICS_MIPS_H_ #define ART_COMPILER_OPTIMIZING_INTRINSICS_MIPS_H_ +#include "base/macros.h" #include "intrinsics.h" -namespace art { +namespace art HIDDEN { class ArenaAllocator; class HInvokeStaticOrDirect; diff --git a/compiler/optimizing/intrinsics_mips64.cc b/compiler/optimizing/intrinsics_mips64.cc index 7b87b03b50..b24eba428a 100644 --- a/compiler/optimizing/intrinsics_mips64.cc +++ b/compiler/optimizing/intrinsics_mips64.cc @@ -30,7 +30,7 @@ #include "utils/mips64/assembler_mips64.h" #include "utils/mips64/constants_mips64.h" -namespace art { +namespace art HIDDEN { namespace mips64 { diff --git a/compiler/optimizing/intrinsics_mips64.h b/compiler/optimizing/intrinsics_mips64.h index ca8bc8f55a..436ce69b7b 100644 --- a/compiler/optimizing/intrinsics_mips64.h +++ b/compiler/optimizing/intrinsics_mips64.h @@ -17,9 +17,10 @@ #ifndef ART_COMPILER_OPTIMIZING_INTRINSICS_MIPS64_H_ #define ART_COMPILER_OPTIMIZING_INTRINSICS_MIPS64_H_ +#include "base/macros.h" #include "intrinsics.h" -namespace art { +namespace art HIDDEN { class ArenaAllocator; class HInvokeStaticOrDirect; diff --git a/compiler/optimizing/intrinsics_utils.h b/compiler/optimizing/intrinsics_utils.h index 41947f1ccd..09d5fe6012 100644 --- a/compiler/optimizing/intrinsics_utils.h +++ b/compiler/optimizing/intrinsics_utils.h @@ -24,7 +24,7 @@ #include "utils/assembler.h" #include "utils/label.h" -namespace art { +namespace art HIDDEN { // Default slow-path for fallback (calling the managed code to handle the intrinsic) in an // intrinsified call. This will copy the arguments into the positions for a regular call. diff --git a/compiler/optimizing/intrinsics_x86.cc b/compiler/optimizing/intrinsics_x86.cc index 5a622ca6d1..011fc1a2e0 100644 --- a/compiler/optimizing/intrinsics_x86.cc +++ b/compiler/optimizing/intrinsics_x86.cc @@ -36,7 +36,7 @@ #include "utils/x86/assembler_x86.h" #include "utils/x86/constants_x86.h" -namespace art { +namespace art HIDDEN { namespace x86 { diff --git a/compiler/optimizing/intrinsics_x86.h b/compiler/optimizing/intrinsics_x86.h index ae150dad43..77c236d244 100644 --- a/compiler/optimizing/intrinsics_x86.h +++ b/compiler/optimizing/intrinsics_x86.h @@ -17,9 +17,10 @@ #ifndef ART_COMPILER_OPTIMIZING_INTRINSICS_X86_H_ #define ART_COMPILER_OPTIMIZING_INTRINSICS_X86_H_ +#include "base/macros.h" #include "intrinsics.h" -namespace art { +namespace art HIDDEN { class ArenaAllocator; class HInvokeStaticOrDirect; diff --git a/compiler/optimizing/intrinsics_x86_64.cc b/compiler/optimizing/intrinsics_x86_64.cc index cbf66069fe..4cc51abdf1 100644 --- a/compiler/optimizing/intrinsics_x86_64.cc +++ b/compiler/optimizing/intrinsics_x86_64.cc @@ -36,7 +36,7 @@ #include "utils/x86_64/assembler_x86_64.h" #include "utils/x86_64/constants_x86_64.h" -namespace art { +namespace art HIDDEN { namespace x86_64 { diff --git a/compiler/optimizing/intrinsics_x86_64.h b/compiler/optimizing/intrinsics_x86_64.h index 199cfede1a..59fe815a94 100644 --- a/compiler/optimizing/intrinsics_x86_64.h +++ b/compiler/optimizing/intrinsics_x86_64.h @@ -17,9 +17,10 @@ #ifndef ART_COMPILER_OPTIMIZING_INTRINSICS_X86_64_H_ #define ART_COMPILER_OPTIMIZING_INTRINSICS_X86_64_H_ +#include "base/macros.h" #include "intrinsics.h" -namespace art { +namespace art HIDDEN { class ArenaAllocator; class HInvokeStaticOrDirect; diff --git a/compiler/optimizing/licm.cc b/compiler/optimizing/licm.cc index 0edb23b857..0c791b640d 100644 --- a/compiler/optimizing/licm.cc +++ b/compiler/optimizing/licm.cc @@ -18,7 +18,7 @@ #include "side_effects_analysis.h" -namespace art { +namespace art HIDDEN { static bool IsPhiOf(HInstruction* instruction, HBasicBlock* block) { return instruction->IsPhi() && instruction->GetBlock() == block; diff --git a/compiler/optimizing/licm.h b/compiler/optimizing/licm.h index 9cafddb05a..1a86b6eb9f 100644 --- a/compiler/optimizing/licm.h +++ b/compiler/optimizing/licm.h @@ -17,10 +17,11 @@ #ifndef ART_COMPILER_OPTIMIZING_LICM_H_ #define ART_COMPILER_OPTIMIZING_LICM_H_ +#include "base/macros.h" #include "nodes.h" #include "optimization.h" -namespace art { +namespace art HIDDEN { class SideEffectsAnalysis; diff --git a/compiler/optimizing/licm_test.cc b/compiler/optimizing/licm_test.cc index adc3cabe87..f8481099f4 100644 --- a/compiler/optimizing/licm_test.cc +++ b/compiler/optimizing/licm_test.cc @@ -17,12 +17,13 @@ #include "licm.h" #include "base/arena_allocator.h" +#include "base/macros.h" #include "builder.h" #include "nodes.h" #include "optimizing_unit_test.h" #include "side_effects_analysis.h" -namespace art { +namespace art HIDDEN { /** * Fixture class for the LICM tests. diff --git a/compiler/optimizing/linear_order.cc b/compiler/optimizing/linear_order.cc index 58e00a810d..25ca866b2c 100644 --- a/compiler/optimizing/linear_order.cc +++ b/compiler/optimizing/linear_order.cc @@ -19,7 +19,7 @@ #include "base/scoped_arena_allocator.h" #include "base/scoped_arena_containers.h" -namespace art { +namespace art HIDDEN { static bool InSameLoop(HLoopInformation* first_loop, HLoopInformation* second_loop) { return first_loop == second_loop; diff --git a/compiler/optimizing/linear_order.h b/compiler/optimizing/linear_order.h index 151db001e1..75e75048a3 100644 --- a/compiler/optimizing/linear_order.h +++ b/compiler/optimizing/linear_order.h @@ -19,9 +19,10 @@ #include <type_traits> +#include "base/macros.h" #include "nodes.h" -namespace art { +namespace art HIDDEN { void LinearizeGraphInternal(const HGraph* graph, ArrayRef<HBasicBlock*> linear_order); diff --git a/compiler/optimizing/linearize_test.cc b/compiler/optimizing/linearize_test.cc index 50bfe843b5..d5aecacd2a 100644 --- a/compiler/optimizing/linearize_test.cc +++ b/compiler/optimizing/linearize_test.cc @@ -17,6 +17,7 @@ #include <fstream> #include "base/arena_allocator.h" +#include "base/macros.h" #include "builder.h" #include "code_generator.h" #include "dex/dex_file.h" @@ -28,7 +29,7 @@ #include "pretty_printer.h" #include "ssa_liveness_analysis.h" -namespace art { +namespace art HIDDEN { class LinearizeTest : public OptimizingUnitTest { protected: diff --git a/compiler/optimizing/live_interval_test.cc b/compiler/optimizing/live_interval_test.cc index c60386d7b7..b5d1336d4a 100644 --- a/compiler/optimizing/live_interval_test.cc +++ b/compiler/optimizing/live_interval_test.cc @@ -15,12 +15,13 @@ */ #include "base/arena_allocator.h" +#include "base/macros.h" #include "optimizing_unit_test.h" #include "ssa_liveness_analysis.h" #include "gtest/gtest.h" -namespace art { +namespace art HIDDEN { TEST(LiveInterval, GetStart) { ArenaPoolAndAllocator pool; diff --git a/compiler/optimizing/live_ranges_test.cc b/compiler/optimizing/live_ranges_test.cc index 60f513ca48..a8cee2b3e9 100644 --- a/compiler/optimizing/live_ranges_test.cc +++ b/compiler/optimizing/live_ranges_test.cc @@ -15,6 +15,7 @@ */ #include "base/arena_allocator.h" +#include "base/macros.h" #include "builder.h" #include "code_generator.h" #include "dex/dex_file.h" @@ -25,7 +26,7 @@ #include "prepare_for_register_allocation.h" #include "ssa_liveness_analysis.h" -namespace art { +namespace art HIDDEN { class LiveRangesTest : public OptimizingUnitTest { public: diff --git a/compiler/optimizing/liveness_test.cc b/compiler/optimizing/liveness_test.cc index f11f7a9779..27aa3e0cdc 100644 --- a/compiler/optimizing/liveness_test.cc +++ b/compiler/optimizing/liveness_test.cc @@ -15,6 +15,7 @@ */ #include "base/arena_allocator.h" +#include "base/macros.h" #include "builder.h" #include "code_generator.h" #include "dex/dex_file.h" @@ -25,7 +26,7 @@ #include "prepare_for_register_allocation.h" #include "ssa_liveness_analysis.h" -namespace art { +namespace art HIDDEN { class LivenessTest : public OptimizingUnitTest { protected: diff --git a/compiler/optimizing/load_store_analysis.cc b/compiler/optimizing/load_store_analysis.cc index 7d7bb94933..a9c162174a 100644 --- a/compiler/optimizing/load_store_analysis.cc +++ b/compiler/optimizing/load_store_analysis.cc @@ -16,7 +16,7 @@ #include "load_store_analysis.h" -namespace art { +namespace art HIDDEN { // A cap for the number of heap locations to prevent pathological time/space consumption. // The number of heap locations for most of the methods stays below this threshold. diff --git a/compiler/optimizing/load_store_analysis.h b/compiler/optimizing/load_store_analysis.h index 08d9309a3e..8d01cbbfd4 100644 --- a/compiler/optimizing/load_store_analysis.h +++ b/compiler/optimizing/load_store_analysis.h @@ -17,11 +17,12 @@ #ifndef ART_COMPILER_OPTIMIZING_LOAD_STORE_ANALYSIS_H_ #define ART_COMPILER_OPTIMIZING_LOAD_STORE_ANALYSIS_H_ +#include "base/macros.h" #include "escape.h" #include "nodes.h" #include "optimization.h" -namespace art { +namespace art HIDDEN { // A ReferenceInfo contains additional info about a reference such as // whether it's a singleton, returned, etc. diff --git a/compiler/optimizing/load_store_analysis_test.cc b/compiler/optimizing/load_store_analysis_test.cc index bfe7a4f72f..3a90e12410 100644 --- a/compiler/optimizing/load_store_analysis_test.cc +++ b/compiler/optimizing/load_store_analysis_test.cc @@ -14,13 +14,14 @@ * limitations under the License. */ +#include "base/macros.h" #include "load_store_analysis.h" #include "nodes.h" #include "optimizing_unit_test.h" #include "gtest/gtest.h" -namespace art { +namespace art HIDDEN { class LoadStoreAnalysisTest : public OptimizingUnitTest { public: diff --git a/compiler/optimizing/load_store_elimination.cc b/compiler/optimizing/load_store_elimination.cc index b33d0f488e..aa787a2fc4 100644 --- a/compiler/optimizing/load_store_elimination.cc +++ b/compiler/optimizing/load_store_elimination.cc @@ -70,7 +70,7 @@ * the special block merging structure. */ -namespace art { +namespace art HIDDEN { // An unknown heap value. Loads with such a value in the heap location cannot be eliminated. // A heap location can be set to kUnknownHeapValue when: diff --git a/compiler/optimizing/load_store_elimination.h b/compiler/optimizing/load_store_elimination.h index f7ba41a1af..c4ba8eb98e 100644 --- a/compiler/optimizing/load_store_elimination.h +++ b/compiler/optimizing/load_store_elimination.h @@ -17,9 +17,10 @@ #ifndef ART_COMPILER_OPTIMIZING_LOAD_STORE_ELIMINATION_H_ #define ART_COMPILER_OPTIMIZING_LOAD_STORE_ELIMINATION_H_ +#include "base/macros.h" #include "optimization.h" -namespace art { +namespace art HIDDEN { class SideEffectsAnalysis; class LoadStoreAnalysis; diff --git a/compiler/optimizing/locations.cc b/compiler/optimizing/locations.cc index 5879c6fa07..595064f8e5 100644 --- a/compiler/optimizing/locations.cc +++ b/compiler/optimizing/locations.cc @@ -21,7 +21,7 @@ #include "code_generator.h" #include "nodes.h" -namespace art { +namespace art HIDDEN { // Verify that Location is trivially copyable. static_assert(std::is_trivially_copyable<Location>::value, "Location should be trivially copyable"); diff --git a/compiler/optimizing/locations.h b/compiler/optimizing/locations.h index d56c151748..f4712425a0 100644 --- a/compiler/optimizing/locations.h +++ b/compiler/optimizing/locations.h @@ -22,9 +22,10 @@ #include "base/bit_field.h" #include "base/bit_utils.h" #include "base/bit_vector.h" +#include "base/macros.h" #include "base/value_object.h" -namespace art { +namespace art HIDDEN { class HConstant; class HInstruction; diff --git a/compiler/optimizing/loop_analysis.cc b/compiler/optimizing/loop_analysis.cc index 2ae3683ffa..f6179da814 100644 --- a/compiler/optimizing/loop_analysis.cc +++ b/compiler/optimizing/loop_analysis.cc @@ -19,7 +19,7 @@ #include "base/bit_vector-inl.h" #include "induction_var_range.h" -namespace art { +namespace art HIDDEN { void LoopAnalysis::CalculateLoopBasicProperties(HLoopInformation* loop_info, LoopAnalysisInfo* analysis_results, diff --git a/compiler/optimizing/loop_analysis.h b/compiler/optimizing/loop_analysis.h index 57509ee410..d517d12e16 100644 --- a/compiler/optimizing/loop_analysis.h +++ b/compiler/optimizing/loop_analysis.h @@ -17,9 +17,10 @@ #ifndef ART_COMPILER_OPTIMIZING_LOOP_ANALYSIS_H_ #define ART_COMPILER_OPTIMIZING_LOOP_ANALYSIS_H_ +#include "base/macros.h" #include "nodes.h" -namespace art { +namespace art HIDDEN { class InductionVarRange; class LoopAnalysis; diff --git a/compiler/optimizing/loop_optimization.cc b/compiler/optimizing/loop_optimization.cc index 9c4e9d25f7..4661d731b5 100644 --- a/compiler/optimizing/loop_optimization.cc +++ b/compiler/optimizing/loop_optimization.cc @@ -28,7 +28,7 @@ #include "mirror/array-inl.h" #include "mirror/string.h" -namespace art { +namespace art HIDDEN { // Enables vectorization (SIMDization) in the loop optimizer. static constexpr bool kEnableVectorization = true; diff --git a/compiler/optimizing/loop_optimization.h b/compiler/optimizing/loop_optimization.h index 1a842c4bf3..f895bff479 100644 --- a/compiler/optimizing/loop_optimization.h +++ b/compiler/optimizing/loop_optimization.h @@ -17,6 +17,7 @@ #ifndef ART_COMPILER_OPTIMIZING_LOOP_OPTIMIZATION_H_ #define ART_COMPILER_OPTIMIZING_LOOP_OPTIMIZATION_H_ +#include "base/macros.h" #include "base/scoped_arena_allocator.h" #include "base/scoped_arena_containers.h" #include "induction_var_range.h" @@ -25,7 +26,7 @@ #include "optimization.h" #include "superblock_cloner.h" -namespace art { +namespace art HIDDEN { class CompilerOptions; class ArchNoOptsLoopHelper; diff --git a/compiler/optimizing/loop_optimization_test.cc b/compiler/optimizing/loop_optimization_test.cc index 310d98b5b0..17db2780ce 100644 --- a/compiler/optimizing/loop_optimization_test.cc +++ b/compiler/optimizing/loop_optimization_test.cc @@ -14,10 +14,11 @@ * limitations under the License. */ +#include "base/macros.h" #include "loop_optimization.h" #include "optimizing_unit_test.h" -namespace art { +namespace art HIDDEN { /** * Fixture class for the loop optimization tests. These unit tests focus diff --git a/compiler/optimizing/nodes.cc b/compiler/optimizing/nodes.cc index 1940d55a9d..502659970c 100644 --- a/compiler/optimizing/nodes.cc +++ b/compiler/optimizing/nodes.cc @@ -31,7 +31,7 @@ #include "scoped_thread_state_change-inl.h" #include "ssa_builder.h" -namespace art { +namespace art HIDDEN { // Enable floating-point static evaluation during constant folding // only if all floating-point operations and constants evaluate in the diff --git a/compiler/optimizing/nodes.h b/compiler/optimizing/nodes.h index 09ae6fab84..e8e6cf8c66 100644 --- a/compiler/optimizing/nodes.h +++ b/compiler/optimizing/nodes.h @@ -27,6 +27,7 @@ #include "base/array_ref.h" #include "base/intrusive_forward_list.h" #include "base/iteration_range.h" +#include "base/macros.h" #include "base/mutex.h" #include "base/quasi_atomic.h" #include "base/stl_util.h" @@ -47,7 +48,7 @@ #include "mirror/method_type.h" #include "offsets.h" -namespace art { +namespace art HIDDEN { class ArenaStack; class GraphChecker; @@ -7875,7 +7876,7 @@ class HIntermediateAddress final : public HExpression<2> { #include "nodes_x86.h" #endif -namespace art { +namespace art HIDDEN { class OptimizingCompilerStats; diff --git a/compiler/optimizing/nodes_mips.h b/compiler/optimizing/nodes_mips.h index 4993f5737e..987ae1492e 100644 --- a/compiler/optimizing/nodes_mips.h +++ b/compiler/optimizing/nodes_mips.h @@ -17,7 +17,7 @@ #ifndef ART_COMPILER_OPTIMIZING_NODES_MIPS_H_ #define ART_COMPILER_OPTIMIZING_NODES_MIPS_H_ -namespace art { +namespace art HIDDEN { // Compute the address of the method for MIPS Constant area support. class HMipsComputeBaseMethodAddress : public HExpression<0> { diff --git a/compiler/optimizing/nodes_shared.cc b/compiler/optimizing/nodes_shared.cc index 2f971b93a6..fc28c0e545 100644 --- a/compiler/optimizing/nodes_shared.cc +++ b/compiler/optimizing/nodes_shared.cc @@ -23,7 +23,7 @@ #include "common_arm64.h" -namespace art { +namespace art HIDDEN { using helpers::CanFitInShifterOperand; diff --git a/compiler/optimizing/nodes_shared.h b/compiler/optimizing/nodes_shared.h index 7dcac1787e..27e610328f 100644 --- a/compiler/optimizing/nodes_shared.h +++ b/compiler/optimizing/nodes_shared.h @@ -22,7 +22,7 @@ // (defining `HInstruction` and co). #include "nodes.h" -namespace art { +namespace art HIDDEN { class HMultiplyAccumulate final : public HExpression<3> { public: diff --git a/compiler/optimizing/nodes_test.cc b/compiler/optimizing/nodes_test.cc index 9bfd250ea4..d012c3294a 100644 --- a/compiler/optimizing/nodes_test.cc +++ b/compiler/optimizing/nodes_test.cc @@ -17,11 +17,12 @@ #include "nodes.h" #include "base/arena_allocator.h" +#include "base/macros.h" #include "optimizing_unit_test.h" #include "gtest/gtest.h" -namespace art { +namespace art HIDDEN { class NodeTest : public OptimizingUnitTest {}; diff --git a/compiler/optimizing/nodes_vector.h b/compiler/optimizing/nodes_vector.h index efe4d6b000..5cc1b3ce8f 100644 --- a/compiler/optimizing/nodes_vector.h +++ b/compiler/optimizing/nodes_vector.h @@ -21,7 +21,7 @@ // is included in the header file nodes.h itself. However it gives editing tools better context. #include "nodes.h" -namespace art { +namespace art HIDDEN { // Memory alignment, represented as an offset relative to a base, where 0 <= offset < base, // and base is a power of two. For example, the value Alignment(16, 0) means memory is diff --git a/compiler/optimizing/nodes_vector_test.cc b/compiler/optimizing/nodes_vector_test.cc index b0a665d704..e0a48db84f 100644 --- a/compiler/optimizing/nodes_vector_test.cc +++ b/compiler/optimizing/nodes_vector_test.cc @@ -15,10 +15,11 @@ */ #include "base/arena_allocator.h" +#include "base/macros.h" #include "nodes.h" #include "optimizing_unit_test.h" -namespace art { +namespace art HIDDEN { /** * Fixture class for testing vector nodes. diff --git a/compiler/optimizing/nodes_x86.h b/compiler/optimizing/nodes_x86.h index 8e8fbc1581..e246390aa5 100644 --- a/compiler/optimizing/nodes_x86.h +++ b/compiler/optimizing/nodes_x86.h @@ -17,7 +17,7 @@ #ifndef ART_COMPILER_OPTIMIZING_NODES_X86_H_ #define ART_COMPILER_OPTIMIZING_NODES_X86_H_ -namespace art { +namespace art HIDDEN { // Compute the address of the method for X86 Constant area support. class HX86ComputeBaseMethodAddress final : public HExpression<0> { diff --git a/compiler/optimizing/optimization.cc b/compiler/optimizing/optimization.cc index 8864a12301..22cbbcdeee 100644 --- a/compiler/optimizing/optimization.cc +++ b/compiler/optimizing/optimization.cc @@ -62,7 +62,7 @@ // Decide between default or alternative pass name. -namespace art { +namespace art HIDDEN { const char* OptimizationPassName(OptimizationPass pass) { switch (pass) { diff --git a/compiler/optimizing/optimization.h b/compiler/optimizing/optimization.h index b84e03894c..6afcc87e01 100644 --- a/compiler/optimizing/optimization.h +++ b/compiler/optimizing/optimization.h @@ -18,10 +18,11 @@ #define ART_COMPILER_OPTIMIZING_OPTIMIZATION_H_ #include "base/arena_object.h" +#include "base/macros.h" #include "nodes.h" #include "optimizing_compiler_stats.h" -namespace art { +namespace art HIDDEN { class CodeGenerator; class DexCompilationUnit; diff --git a/compiler/optimizing/optimizing_cfi_test.cc b/compiler/optimizing/optimizing_cfi_test.cc index a52031cced..a3e4c616b8 100644 --- a/compiler/optimizing/optimizing_cfi_test.cc +++ b/compiler/optimizing/optimizing_cfi_test.cc @@ -18,6 +18,7 @@ #include <vector> #include "arch/instruction_set.h" +#include "base/macros.h" #include "base/runtime_debug.h" #include "cfi_test.h" #include "driver/compiler_options.h" @@ -34,7 +35,7 @@ namespace vixl32 = vixl::aarch32; -namespace art { +namespace art HIDDEN { // Run the tests only on host. #ifndef ART_TARGET_ANDROID diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index a45f5025d8..29c653f1b6 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -66,7 +66,7 @@ #include "utils/assembler.h" #include "verifier/verifier_compiler_binding.h" -namespace art { +namespace art HIDDEN { static constexpr size_t kArenaAllocatorMemoryReportThreshold = 8 * MB; diff --git a/compiler/optimizing/optimizing_compiler.h b/compiler/optimizing/optimizing_compiler.h index cd6d684590..d8bd11c3d6 100644 --- a/compiler/optimizing/optimizing_compiler.h +++ b/compiler/optimizing/optimizing_compiler.h @@ -18,9 +18,10 @@ #define ART_COMPILER_OPTIMIZING_OPTIMIZING_COMPILER_H_ #include "base/globals.h" +#include "base/macros.h" #include "base/mutex.h" -namespace art { +namespace art HIDDEN { class ArtMethod; class Compiler; diff --git a/compiler/optimizing/optimizing_compiler_stats.h b/compiler/optimizing/optimizing_compiler_stats.h index 83dbef7409..6a69a336ca 100644 --- a/compiler/optimizing/optimizing_compiler_stats.h +++ b/compiler/optimizing/optimizing_compiler_stats.h @@ -26,8 +26,9 @@ #include "base/atomic.h" #include "base/globals.h" +#include "base/macros.h" -namespace art { +namespace art HIDDEN { enum class MethodCompilationStat { kAttemptBytecodeCompilation = 0, diff --git a/compiler/optimizing/optimizing_unit_test.h b/compiler/optimizing/optimizing_unit_test.h index e5f694109a..d3229e5750 100644 --- a/compiler/optimizing/optimizing_unit_test.h +++ b/compiler/optimizing/optimizing_unit_test.h @@ -20,6 +20,7 @@ #include <memory> #include <vector> +#include "base/macros.h" #include "base/malloc_arena_pool.h" #include "base/scoped_arena_allocator.h" #include "builder.h" @@ -40,7 +41,7 @@ #include "gtest/gtest.h" -namespace art { +namespace art HIDDEN { #define NUM_INSTRUCTIONS(...) \ (sizeof((uint16_t[]) {__VA_ARGS__}) /sizeof(uint16_t)) diff --git a/compiler/optimizing/parallel_move_resolver.cc b/compiler/optimizing/parallel_move_resolver.cc index 2036b4a370..9fc4cc86bf 100644 --- a/compiler/optimizing/parallel_move_resolver.cc +++ b/compiler/optimizing/parallel_move_resolver.cc @@ -19,7 +19,7 @@ #include "base/stl_util.h" #include "nodes.h" -namespace art { +namespace art HIDDEN { void ParallelMoveResolver::BuildInitialMoveList(HParallelMove* parallel_move) { // Perform a linear sweep of the moves to add them to the initial list of diff --git a/compiler/optimizing/parallel_move_resolver.h b/compiler/optimizing/parallel_move_resolver.h index 5fadcab402..17d5122542 100644 --- a/compiler/optimizing/parallel_move_resolver.h +++ b/compiler/optimizing/parallel_move_resolver.h @@ -18,11 +18,12 @@ #define ART_COMPILER_OPTIMIZING_PARALLEL_MOVE_RESOLVER_H_ #include "base/arena_containers.h" +#include "base/macros.h" #include "base/value_object.h" #include "data_type.h" #include "locations.h" -namespace art { +namespace art HIDDEN { class HParallelMove; class MoveOperands; diff --git a/compiler/optimizing/parallel_move_test.cc b/compiler/optimizing/parallel_move_test.cc index a8ab6cdd0c..a1c05e9cad 100644 --- a/compiler/optimizing/parallel_move_test.cc +++ b/compiler/optimizing/parallel_move_test.cc @@ -15,6 +15,7 @@ */ #include "base/arena_allocator.h" +#include "base/macros.h" #include "base/malloc_arena_pool.h" #include "nodes.h" #include "parallel_move_resolver.h" @@ -22,7 +23,7 @@ #include "gtest/gtest-typed-test.h" #include "gtest/gtest.h" -namespace art { +namespace art HIDDEN { constexpr int kScratchRegisterStartIndexForTest = 100; diff --git a/compiler/optimizing/pc_relative_fixups_mips.cc b/compiler/optimizing/pc_relative_fixups_mips.cc index 05208ff65c..1e8f522074 100644 --- a/compiler/optimizing/pc_relative_fixups_mips.cc +++ b/compiler/optimizing/pc_relative_fixups_mips.cc @@ -18,7 +18,7 @@ #include "code_generator_mips.h" #include "intrinsics_mips.h" -namespace art { +namespace art HIDDEN { namespace mips { /** diff --git a/compiler/optimizing/pc_relative_fixups_mips.h b/compiler/optimizing/pc_relative_fixups_mips.h index 872370bcb7..42511eb993 100644 --- a/compiler/optimizing/pc_relative_fixups_mips.h +++ b/compiler/optimizing/pc_relative_fixups_mips.h @@ -17,10 +17,11 @@ #ifndef ART_COMPILER_OPTIMIZING_PC_RELATIVE_FIXUPS_MIPS_H_ #define ART_COMPILER_OPTIMIZING_PC_RELATIVE_FIXUPS_MIPS_H_ +#include "base/macros.h" #include "nodes.h" #include "optimization.h" -namespace art { +namespace art HIDDEN { class CodeGenerator; diff --git a/compiler/optimizing/pc_relative_fixups_x86.cc b/compiler/optimizing/pc_relative_fixups_x86.cc index 1d8d1a6e90..3c3bacd3f8 100644 --- a/compiler/optimizing/pc_relative_fixups_x86.cc +++ b/compiler/optimizing/pc_relative_fixups_x86.cc @@ -18,7 +18,7 @@ #include "code_generator_x86.h" #include "intrinsics_x86.h" -namespace art { +namespace art HIDDEN { namespace x86 { /** diff --git a/compiler/optimizing/pc_relative_fixups_x86.h b/compiler/optimizing/pc_relative_fixups_x86.h index 3b470a6502..45578d8050 100644 --- a/compiler/optimizing/pc_relative_fixups_x86.h +++ b/compiler/optimizing/pc_relative_fixups_x86.h @@ -17,10 +17,11 @@ #ifndef ART_COMPILER_OPTIMIZING_PC_RELATIVE_FIXUPS_X86_H_ #define ART_COMPILER_OPTIMIZING_PC_RELATIVE_FIXUPS_X86_H_ +#include "base/macros.h" #include "nodes.h" #include "optimization.h" -namespace art { +namespace art HIDDEN { class CodeGenerator; diff --git a/compiler/optimizing/prepare_for_register_allocation.cc b/compiler/optimizing/prepare_for_register_allocation.cc index 8c4615d8c2..76ba71f6f6 100644 --- a/compiler/optimizing/prepare_for_register_allocation.cc +++ b/compiler/optimizing/prepare_for_register_allocation.cc @@ -22,7 +22,7 @@ #include "optimizing_compiler_stats.h" #include "well_known_classes.h" -namespace art { +namespace art HIDDEN { void PrepareForRegisterAllocation::Run() { // Order does not matter. diff --git a/compiler/optimizing/prepare_for_register_allocation.h b/compiler/optimizing/prepare_for_register_allocation.h index e0bb76eb22..0426f8470b 100644 --- a/compiler/optimizing/prepare_for_register_allocation.h +++ b/compiler/optimizing/prepare_for_register_allocation.h @@ -17,9 +17,10 @@ #ifndef ART_COMPILER_OPTIMIZING_PREPARE_FOR_REGISTER_ALLOCATION_H_ #define ART_COMPILER_OPTIMIZING_PREPARE_FOR_REGISTER_ALLOCATION_H_ +#include "base/macros.h" #include "nodes.h" -namespace art { +namespace art HIDDEN { class CompilerOptions; class OptimizingCompilerStats; diff --git a/compiler/optimizing/pretty_printer.h b/compiler/optimizing/pretty_printer.h index 8ef9ce4e8b..77ddb97707 100644 --- a/compiler/optimizing/pretty_printer.h +++ b/compiler/optimizing/pretty_printer.h @@ -19,9 +19,10 @@ #include "android-base/stringprintf.h" +#include "base/macros.h" #include "nodes.h" -namespace art { +namespace art HIDDEN { class HPrettyPrinter : public HGraphVisitor { public: diff --git a/compiler/optimizing/pretty_printer_test.cc b/compiler/optimizing/pretty_printer_test.cc index 6ef386b4a5..5ed39442bf 100644 --- a/compiler/optimizing/pretty_printer_test.cc +++ b/compiler/optimizing/pretty_printer_test.cc @@ -17,6 +17,7 @@ #include "pretty_printer.h" #include "base/arena_allocator.h" +#include "base/macros.h" #include "builder.h" #include "dex/dex_file.h" #include "dex/dex_instruction.h" @@ -25,7 +26,7 @@ #include "gtest/gtest.h" -namespace art { +namespace art HIDDEN { class PrettyPrinterTest : public OptimizingUnitTest { protected: diff --git a/compiler/optimizing/reference_type_propagation.cc b/compiler/optimizing/reference_type_propagation.cc index 4929e0a3a1..82dcb12097 100644 --- a/compiler/optimizing/reference_type_propagation.cc +++ b/compiler/optimizing/reference_type_propagation.cc @@ -28,7 +28,7 @@ #include "mirror/dex_cache.h" #include "scoped_thread_state_change-inl.h" -namespace art { +namespace art HIDDEN { static inline ObjPtr<mirror::DexCache> FindDexCacheWithHint( Thread* self, const DexFile& dex_file, Handle<mirror::DexCache> hint_dex_cache) diff --git a/compiler/optimizing/reference_type_propagation.h b/compiler/optimizing/reference_type_propagation.h index 7c6a048444..738f2f3272 100644 --- a/compiler/optimizing/reference_type_propagation.h +++ b/compiler/optimizing/reference_type_propagation.h @@ -18,12 +18,13 @@ #define ART_COMPILER_OPTIMIZING_REFERENCE_TYPE_PROPAGATION_H_ #include "base/arena_containers.h" +#include "base/macros.h" #include "mirror/class-inl.h" #include "nodes.h" #include "obj_ptr.h" #include "optimization.h" -namespace art { +namespace art HIDDEN { /** * Propagates reference types to instructions. diff --git a/compiler/optimizing/reference_type_propagation_test.cc b/compiler/optimizing/reference_type_propagation_test.cc index 028b6d3b79..5496903a2a 100644 --- a/compiler/optimizing/reference_type_propagation_test.cc +++ b/compiler/optimizing/reference_type_propagation_test.cc @@ -17,12 +17,13 @@ #include "reference_type_propagation.h" #include "base/arena_allocator.h" +#include "base/macros.h" #include "builder.h" #include "nodes.h" #include "object_lock.h" #include "optimizing_unit_test.h" -namespace art { +namespace art HIDDEN { /** * Fixture class for unit testing the ReferenceTypePropagation phase. Used to verify the diff --git a/compiler/optimizing/register_allocation_resolver.cc b/compiler/optimizing/register_allocation_resolver.cc index 1786048b12..342bbad8e3 100644 --- a/compiler/optimizing/register_allocation_resolver.cc +++ b/compiler/optimizing/register_allocation_resolver.cc @@ -21,7 +21,7 @@ #include "linear_order.h" #include "ssa_liveness_analysis.h" -namespace art { +namespace art HIDDEN { RegisterAllocationResolver::RegisterAllocationResolver(CodeGenerator* codegen, const SsaLivenessAnalysis& liveness) diff --git a/compiler/optimizing/register_allocation_resolver.h b/compiler/optimizing/register_allocation_resolver.h index 278371777d..f4782eb48e 100644 --- a/compiler/optimizing/register_allocation_resolver.h +++ b/compiler/optimizing/register_allocation_resolver.h @@ -18,10 +18,11 @@ #define ART_COMPILER_OPTIMIZING_REGISTER_ALLOCATION_RESOLVER_H_ #include "base/array_ref.h" +#include "base/macros.h" #include "base/value_object.h" #include "data_type.h" -namespace art { +namespace art HIDDEN { class ArenaAllocator; class CodeGenerator; diff --git a/compiler/optimizing/register_allocator.cc b/compiler/optimizing/register_allocator.cc index bad73e1b61..7bde4245df 100644 --- a/compiler/optimizing/register_allocator.cc +++ b/compiler/optimizing/register_allocator.cc @@ -27,7 +27,7 @@ #include "register_allocator_linear_scan.h" #include "ssa_liveness_analysis.h" -namespace art { +namespace art HIDDEN { RegisterAllocator::RegisterAllocator(ScopedArenaAllocator* allocator, CodeGenerator* codegen, diff --git a/compiler/optimizing/register_allocator.h b/compiler/optimizing/register_allocator.h index 18ef69fcab..04345a7429 100644 --- a/compiler/optimizing/register_allocator.h +++ b/compiler/optimizing/register_allocator.h @@ -22,7 +22,7 @@ #include "base/arena_object.h" #include "base/macros.h" -namespace art { +namespace art HIDDEN { class CodeGenerator; class HBasicBlock; diff --git a/compiler/optimizing/register_allocator_graph_color.cc b/compiler/optimizing/register_allocator_graph_color.cc index 42e6498148..d3dccd3030 100644 --- a/compiler/optimizing/register_allocator_graph_color.cc +++ b/compiler/optimizing/register_allocator_graph_color.cc @@ -22,7 +22,7 @@ #include "ssa_liveness_analysis.h" #include "thread-current-inl.h" -namespace art { +namespace art HIDDEN { // Highest number of registers that we support for any platform. This can be used for std::bitset, // for example, which needs to know its size at compile time. diff --git a/compiler/optimizing/register_allocator_graph_color.h b/compiler/optimizing/register_allocator_graph_color.h index f0e7e55863..ad203fa6ba 100644 --- a/compiler/optimizing/register_allocator_graph_color.h +++ b/compiler/optimizing/register_allocator_graph_color.h @@ -24,7 +24,7 @@ #include "base/scoped_arena_containers.h" #include "register_allocator.h" -namespace art { +namespace art HIDDEN { class CodeGenerator; class HBasicBlock; diff --git a/compiler/optimizing/register_allocator_linear_scan.cc b/compiler/optimizing/register_allocator_linear_scan.cc index 0d6c5a3eff..cf21e781c6 100644 --- a/compiler/optimizing/register_allocator_linear_scan.cc +++ b/compiler/optimizing/register_allocator_linear_scan.cc @@ -26,7 +26,7 @@ #include "register_allocation_resolver.h" #include "ssa_liveness_analysis.h" -namespace art { +namespace art HIDDEN { static constexpr size_t kMaxLifetimePosition = -1; static constexpr size_t kDefaultNumberOfSpillSlots = 4; diff --git a/compiler/optimizing/register_allocator_linear_scan.h b/compiler/optimizing/register_allocator_linear_scan.h index 4d445c7ff7..94381a77ac 100644 --- a/compiler/optimizing/register_allocator_linear_scan.h +++ b/compiler/optimizing/register_allocator_linear_scan.h @@ -22,7 +22,7 @@ #include "base/macros.h" #include "register_allocator.h" -namespace art { +namespace art HIDDEN { class CodeGenerator; class HBasicBlock; diff --git a/compiler/optimizing/register_allocator_test.cc b/compiler/optimizing/register_allocator_test.cc index 79eb082cd7..bd06815965 100644 --- a/compiler/optimizing/register_allocator_test.cc +++ b/compiler/optimizing/register_allocator_test.cc @@ -18,6 +18,7 @@ #include "arch/x86/instruction_set_features_x86.h" #include "base/arena_allocator.h" +#include "base/macros.h" #include "builder.h" #include "code_generator.h" #include "code_generator_x86.h" @@ -31,7 +32,7 @@ #include "ssa_liveness_analysis.h" #include "ssa_phi_elimination.h" -namespace art { +namespace art HIDDEN { using Strategy = RegisterAllocator::Strategy; diff --git a/compiler/optimizing/scheduler.cc b/compiler/optimizing/scheduler.cc index e5ff8a886a..5dc9ac0d51 100644 --- a/compiler/optimizing/scheduler.cc +++ b/compiler/optimizing/scheduler.cc @@ -31,7 +31,7 @@ #include "scheduler_arm.h" #endif -namespace art { +namespace art HIDDEN { void SchedulingGraph::AddDependency(SchedulingNode* node, SchedulingNode* dependency, diff --git a/compiler/optimizing/scheduler.h b/compiler/optimizing/scheduler.h index a97eda7e85..9bf0aa7f86 100644 --- a/compiler/optimizing/scheduler.h +++ b/compiler/optimizing/scheduler.h @@ -19,6 +19,7 @@ #include <fstream> +#include "base/macros.h" #include "base/scoped_arena_allocator.h" #include "base/scoped_arena_containers.h" #include "base/stl_util.h" @@ -28,7 +29,7 @@ #include "nodes.h" #include "optimization.h" -namespace art { +namespace art HIDDEN { // General description of instruction scheduling. // diff --git a/compiler/optimizing/scheduler_arm.cc b/compiler/optimizing/scheduler_arm.cc index 858a555e97..686ec76cfc 100644 --- a/compiler/optimizing/scheduler_arm.cc +++ b/compiler/optimizing/scheduler_arm.cc @@ -23,7 +23,7 @@ #include "mirror/array-inl.h" #include "mirror/string.h" -namespace art { +namespace art HIDDEN { namespace arm { using helpers::Int32ConstantFrom; diff --git a/compiler/optimizing/scheduler_arm.h b/compiler/optimizing/scheduler_arm.h index 4c7a3bb4d6..5fcf5f9bfd 100644 --- a/compiler/optimizing/scheduler_arm.h +++ b/compiler/optimizing/scheduler_arm.h @@ -17,10 +17,11 @@ #ifndef ART_COMPILER_OPTIMIZING_SCHEDULER_ARM_H_ #define ART_COMPILER_OPTIMIZING_SCHEDULER_ARM_H_ +#include "base/macros.h" #include "code_generator_arm_vixl.h" #include "scheduler.h" -namespace art { +namespace art HIDDEN { namespace arm { // TODO: Replace CodeGeneratorARMType with CodeGeneratorARMVIXL everywhere? typedef CodeGeneratorARMVIXL CodeGeneratorARMType; diff --git a/compiler/optimizing/scheduler_arm64.cc b/compiler/optimizing/scheduler_arm64.cc index 7bcf4e75a9..c4a804d91b 100644 --- a/compiler/optimizing/scheduler_arm64.cc +++ b/compiler/optimizing/scheduler_arm64.cc @@ -20,7 +20,7 @@ #include "mirror/array-inl.h" #include "mirror/string.h" -namespace art { +namespace art HIDDEN { namespace arm64 { void SchedulingLatencyVisitorARM64::VisitBinaryOperation(HBinaryOperation* instr) { diff --git a/compiler/optimizing/scheduler_arm64.h b/compiler/optimizing/scheduler_arm64.h index ba5a743545..420f5583ec 100644 --- a/compiler/optimizing/scheduler_arm64.h +++ b/compiler/optimizing/scheduler_arm64.h @@ -17,9 +17,10 @@ #ifndef ART_COMPILER_OPTIMIZING_SCHEDULER_ARM64_H_ #define ART_COMPILER_OPTIMIZING_SCHEDULER_ARM64_H_ +#include "base/macros.h" #include "scheduler.h" -namespace art { +namespace art HIDDEN { namespace arm64 { static constexpr uint32_t kArm64MemoryLoadLatency = 5; diff --git a/compiler/optimizing/scheduler_test.cc b/compiler/optimizing/scheduler_test.cc index 4c47f2ee57..6baa2bd772 100644 --- a/compiler/optimizing/scheduler_test.cc +++ b/compiler/optimizing/scheduler_test.cc @@ -17,6 +17,7 @@ #include "scheduler.h" #include "base/arena_allocator.h" +#include "base/macros.h" #include "builder.h" #include "codegen_test_utils.h" #include "common_compiler_test.h" @@ -34,7 +35,7 @@ #include "scheduler_arm.h" #endif -namespace art { +namespace art HIDDEN { // Return all combinations of ISA and code generator that are executable on // hardware, or on simulator, and that we'd like to test. diff --git a/compiler/optimizing/select_generator.cc b/compiler/optimizing/select_generator.cc index dcc7f77fc2..f1637629ec 100644 --- a/compiler/optimizing/select_generator.cc +++ b/compiler/optimizing/select_generator.cc @@ -19,7 +19,7 @@ #include "base/scoped_arena_containers.h" #include "reference_type_propagation.h" -namespace art { +namespace art HIDDEN { static constexpr size_t kMaxInstructionsInBranch = 1u; diff --git a/compiler/optimizing/select_generator.h b/compiler/optimizing/select_generator.h index 2889166f60..999d10c597 100644 --- a/compiler/optimizing/select_generator.h +++ b/compiler/optimizing/select_generator.h @@ -57,9 +57,10 @@ #ifndef ART_COMPILER_OPTIMIZING_SELECT_GENERATOR_H_ #define ART_COMPILER_OPTIMIZING_SELECT_GENERATOR_H_ +#include "base/macros.h" #include "optimization.h" -namespace art { +namespace art HIDDEN { class HSelectGenerator : public HOptimization { public: diff --git a/compiler/optimizing/select_generator_test.cc b/compiler/optimizing/select_generator_test.cc index 6e6549737c..4e8e714aa1 100644 --- a/compiler/optimizing/select_generator_test.cc +++ b/compiler/optimizing/select_generator_test.cc @@ -17,12 +17,13 @@ #include "select_generator.h" #include "base/arena_allocator.h" +#include "base/macros.h" #include "builder.h" #include "nodes.h" #include "optimizing_unit_test.h" #include "side_effects_analysis.h" -namespace art { +namespace art HIDDEN { class SelectGeneratorTest : public ImprovedOptimizingUnitTest { public: diff --git a/compiler/optimizing/sharpening.cc b/compiler/optimizing/sharpening.cc index b8471e3721..4d1bf7f967 100644 --- a/compiler/optimizing/sharpening.cc +++ b/compiler/optimizing/sharpening.cc @@ -34,7 +34,7 @@ #include "runtime.h" #include "scoped_thread_state_change-inl.h" -namespace art { +namespace art HIDDEN { static bool IsInBootImage(ArtMethod* method) { gc::Heap* heap = Runtime::Current()->GetHeap(); diff --git a/compiler/optimizing/sharpening.h b/compiler/optimizing/sharpening.h index b81867201f..1909a5e873 100644 --- a/compiler/optimizing/sharpening.h +++ b/compiler/optimizing/sharpening.h @@ -17,10 +17,11 @@ #ifndef ART_COMPILER_OPTIMIZING_SHARPENING_H_ #define ART_COMPILER_OPTIMIZING_SHARPENING_H_ +#include "base/macros.h" #include "nodes.h" #include "optimization.h" -namespace art { +namespace art HIDDEN { class CodeGenerator; class DexCompilationUnit; diff --git a/compiler/optimizing/side_effects_analysis.cc b/compiler/optimizing/side_effects_analysis.cc index ba97b43de9..56719b100e 100644 --- a/compiler/optimizing/side_effects_analysis.cc +++ b/compiler/optimizing/side_effects_analysis.cc @@ -16,7 +16,7 @@ #include "side_effects_analysis.h" -namespace art { +namespace art HIDDEN { bool SideEffectsAnalysis::Run() { // Inlining might have created more blocks, so we need to increase the size diff --git a/compiler/optimizing/side_effects_analysis.h b/compiler/optimizing/side_effects_analysis.h index 56a01e63f1..47fcdc5d1b 100644 --- a/compiler/optimizing/side_effects_analysis.h +++ b/compiler/optimizing/side_effects_analysis.h @@ -18,10 +18,11 @@ #define ART_COMPILER_OPTIMIZING_SIDE_EFFECTS_ANALYSIS_H_ #include "base/arena_containers.h" +#include "base/macros.h" #include "nodes.h" #include "optimization.h" -namespace art { +namespace art HIDDEN { class SideEffectsAnalysis : public HOptimization { public: diff --git a/compiler/optimizing/side_effects_test.cc b/compiler/optimizing/side_effects_test.cc index cf26e79c69..427dff61c2 100644 --- a/compiler/optimizing/side_effects_test.cc +++ b/compiler/optimizing/side_effects_test.cc @@ -16,10 +16,11 @@ #include <gtest/gtest.h> +#include "base/macros.h" #include "data_type.h" #include "nodes.h" -namespace art { +namespace art HIDDEN { // Only runtime types other than void are allowed. static const DataType::Type kTestTypes[] = { diff --git a/compiler/optimizing/ssa_builder.cc b/compiler/optimizing/ssa_builder.cc index a5e8ff65a9..569d80bdd3 100644 --- a/compiler/optimizing/ssa_builder.cc +++ b/compiler/optimizing/ssa_builder.cc @@ -27,7 +27,7 @@ #include "scoped_thread_state_change-inl.h" #include "ssa_phi_elimination.h" -namespace art { +namespace art HIDDEN { void SsaBuilder::FixNullConstantType() { // The order doesn't matter here. diff --git a/compiler/optimizing/ssa_builder.h b/compiler/optimizing/ssa_builder.h index bb892c9304..9eb2788752 100644 --- a/compiler/optimizing/ssa_builder.h +++ b/compiler/optimizing/ssa_builder.h @@ -17,12 +17,13 @@ #ifndef ART_COMPILER_OPTIMIZING_SSA_BUILDER_H_ #define ART_COMPILER_OPTIMIZING_SSA_BUILDER_H_ +#include "base/macros.h" #include "base/scoped_arena_allocator.h" #include "base/scoped_arena_containers.h" #include "nodes.h" #include "optimization.h" -namespace art { +namespace art HIDDEN { /** * Transforms a graph into SSA form. The liveness guarantees of diff --git a/compiler/optimizing/ssa_liveness_analysis.cc b/compiler/optimizing/ssa_liveness_analysis.cc index 7b2c3a939c..309d9f929a 100644 --- a/compiler/optimizing/ssa_liveness_analysis.cc +++ b/compiler/optimizing/ssa_liveness_analysis.cc @@ -21,7 +21,7 @@ #include "linear_order.h" #include "nodes.h" -namespace art { +namespace art HIDDEN { void SsaLivenessAnalysis::Analyze() { // Compute the linear order directly in the graph's data structure diff --git a/compiler/optimizing/ssa_liveness_analysis.h b/compiler/optimizing/ssa_liveness_analysis.h index 3ea2815e64..97bd1dda3a 100644 --- a/compiler/optimizing/ssa_liveness_analysis.h +++ b/compiler/optimizing/ssa_liveness_analysis.h @@ -21,11 +21,12 @@ #include "base/intrusive_forward_list.h" #include "base/iteration_range.h" +#include "base/macros.h" #include "base/scoped_arena_allocator.h" #include "base/scoped_arena_containers.h" #include "nodes.h" -namespace art { +namespace art HIDDEN { class CodeGenerator; class SsaLivenessAnalysis; diff --git a/compiler/optimizing/ssa_liveness_analysis_test.cc b/compiler/optimizing/ssa_liveness_analysis_test.cc index 352c44f63a..f6229f0a51 100644 --- a/compiler/optimizing/ssa_liveness_analysis_test.cc +++ b/compiler/optimizing/ssa_liveness_analysis_test.cc @@ -20,12 +20,13 @@ #include "arch/instruction_set_features.h" #include "base/arena_allocator.h" #include "base/arena_containers.h" +#include "base/macros.h" #include "code_generator.h" #include "driver/compiler_options.h" #include "nodes.h" #include "optimizing_unit_test.h" -namespace art { +namespace art HIDDEN { class SsaLivenessAnalysisTest : public OptimizingUnitTest { protected: diff --git a/compiler/optimizing/ssa_phi_elimination.cc b/compiler/optimizing/ssa_phi_elimination.cc index 3fcb72e4fb..77f9964e98 100644 --- a/compiler/optimizing/ssa_phi_elimination.cc +++ b/compiler/optimizing/ssa_phi_elimination.cc @@ -21,7 +21,7 @@ #include "base/scoped_arena_containers.h" #include "base/bit_vector-inl.h" -namespace art { +namespace art HIDDEN { bool SsaDeadPhiElimination::Run() { MarkDeadPhis(); diff --git a/compiler/optimizing/ssa_phi_elimination.h b/compiler/optimizing/ssa_phi_elimination.h index c5cc752ffc..f606f928fa 100644 --- a/compiler/optimizing/ssa_phi_elimination.h +++ b/compiler/optimizing/ssa_phi_elimination.h @@ -17,10 +17,11 @@ #ifndef ART_COMPILER_OPTIMIZING_SSA_PHI_ELIMINATION_H_ #define ART_COMPILER_OPTIMIZING_SSA_PHI_ELIMINATION_H_ +#include "base/macros.h" #include "nodes.h" #include "optimization.h" -namespace art { +namespace art HIDDEN { /** * Optimization phase that removes dead phis from the graph. Dead phis are unused diff --git a/compiler/optimizing/ssa_test.cc b/compiler/optimizing/ssa_test.cc index e679893af2..008e435a77 100644 --- a/compiler/optimizing/ssa_test.cc +++ b/compiler/optimizing/ssa_test.cc @@ -17,6 +17,7 @@ #include "android-base/stringprintf.h" #include "base/arena_allocator.h" +#include "base/macros.h" #include "builder.h" #include "dex/dex_file.h" #include "dex/dex_instruction.h" @@ -27,7 +28,7 @@ #include "gtest/gtest.h" -namespace art { +namespace art HIDDEN { class SsaTest : public OptimizingUnitTest { protected: diff --git a/compiler/optimizing/stack_map_stream.cc b/compiler/optimizing/stack_map_stream.cc index 3f6010d7af..777cbf7f74 100644 --- a/compiler/optimizing/stack_map_stream.cc +++ b/compiler/optimizing/stack_map_stream.cc @@ -26,7 +26,7 @@ #include "scoped_thread_state_change-inl.h" #include "stack_map.h" -namespace art { +namespace art HIDDEN { constexpr static bool kVerifyStackMaps = kIsDebugBuild; diff --git a/compiler/optimizing/stack_map_stream.h b/compiler/optimizing/stack_map_stream.h index f45e3d720e..1e5dc17171 100644 --- a/compiler/optimizing/stack_map_stream.h +++ b/compiler/optimizing/stack_map_stream.h @@ -21,6 +21,7 @@ #include "base/arena_bit_vector.h" #include "base/bit_table.h" #include "base/bit_vector-inl.h" +#include "base/macros.h" #include "base/memory_region.h" #include "base/scoped_arena_containers.h" #include "base/value_object.h" @@ -28,7 +29,7 @@ #include "nodes.h" #include "stack_map.h" -namespace art { +namespace art HIDDEN { /** * Collects and builds stack maps for a method. All the stack maps diff --git a/compiler/optimizing/stack_map_test.cc b/compiler/optimizing/stack_map_test.cc index d28f09fbba..62c00b0a22 100644 --- a/compiler/optimizing/stack_map_test.cc +++ b/compiler/optimizing/stack_map_test.cc @@ -18,12 +18,13 @@ #include "art_method.h" #include "base/arena_bit_vector.h" +#include "base/macros.h" #include "base/malloc_arena_pool.h" #include "stack_map_stream.h" #include "gtest/gtest.h" -namespace art { +namespace art HIDDEN { // Check that the stack mask of given stack map is identical // to the given bit vector. Returns true if they are same. diff --git a/compiler/optimizing/superblock_cloner.cc b/compiler/optimizing/superblock_cloner.cc index dc433feb51..6559453134 100644 --- a/compiler/optimizing/superblock_cloner.cc +++ b/compiler/optimizing/superblock_cloner.cc @@ -22,7 +22,7 @@ #include <iostream> -namespace art { +namespace art HIDDEN { using HBasicBlockMap = SuperblockCloner::HBasicBlockMap; using HInstructionMap = SuperblockCloner::HInstructionMap; diff --git a/compiler/optimizing/superblock_cloner.h b/compiler/optimizing/superblock_cloner.h index ece0914ddb..16bc0c154c 100644 --- a/compiler/optimizing/superblock_cloner.h +++ b/compiler/optimizing/superblock_cloner.h @@ -20,9 +20,10 @@ #include "base/arena_bit_vector.h" #include "base/arena_containers.h" #include "base/bit_vector-inl.h" +#include "base/macros.h" #include "nodes.h" -namespace art { +namespace art HIDDEN { class InductionVarRange; diff --git a/compiler/optimizing/superblock_cloner_test.cc b/compiler/optimizing/superblock_cloner_test.cc index aa19de683f..fa60e4a474 100644 --- a/compiler/optimizing/superblock_cloner_test.cc +++ b/compiler/optimizing/superblock_cloner_test.cc @@ -14,6 +14,7 @@ * limitations under the License. */ +#include "base/macros.h" #include "graph_checker.h" #include "nodes.h" #include "optimizing_unit_test.h" @@ -21,7 +22,7 @@ #include "gtest/gtest.h" -namespace art { +namespace art HIDDEN { using HBasicBlockMap = SuperblockCloner::HBasicBlockMap; using HInstructionMap = SuperblockCloner::HInstructionMap; diff --git a/compiler/optimizing/suspend_check_test.cc b/compiler/optimizing/suspend_check_test.cc index 33823e2a11..93a84b4e0a 100644 --- a/compiler/optimizing/suspend_check_test.cc +++ b/compiler/optimizing/suspend_check_test.cc @@ -14,6 +14,7 @@ * limitations under the License. */ +#include "base/macros.h" #include "builder.h" #include "dex/dex_instruction.h" #include "nodes.h" @@ -22,7 +23,7 @@ #include "gtest/gtest.h" -namespace art { +namespace art HIDDEN { /** * Check that the HGraphBuilder adds suspend checks to backward branches. diff --git a/compiler/optimizing/x86_memory_gen.cc b/compiler/optimizing/x86_memory_gen.cc index b1abcf6747..82652142a7 100644 --- a/compiler/optimizing/x86_memory_gen.cc +++ b/compiler/optimizing/x86_memory_gen.cc @@ -18,7 +18,7 @@ #include "code_generator.h" #include "driver/compiler_options.h" -namespace art { +namespace art HIDDEN { namespace x86 { /** diff --git a/compiler/optimizing/x86_memory_gen.h b/compiler/optimizing/x86_memory_gen.h index 3f4178d58a..1cae1a5d3a 100644 --- a/compiler/optimizing/x86_memory_gen.h +++ b/compiler/optimizing/x86_memory_gen.h @@ -17,10 +17,11 @@ #ifndef ART_COMPILER_OPTIMIZING_X86_MEMORY_GEN_H_ #define ART_COMPILER_OPTIMIZING_X86_MEMORY_GEN_H_ +#include "base/macros.h" #include "nodes.h" #include "optimization.h" -namespace art { +namespace art HIDDEN { class CodeGenerator; namespace x86 { |