diff options
Diffstat (limited to 'runtime')
189 files changed, 323 insertions, 295 deletions
diff --git a/runtime/arch/arch_test.cc b/runtime/arch/arch_test.cc index dd98f5132f..bfac8c422d 100644 --- a/runtime/arch/arch_test.cc +++ b/runtime/arch/arch_test.cc @@ -21,7 +21,6 @@ #include "common_runtime_test.h" #include "quick/quick_method_frame_info.h" - // asm_support.h declares tests next to the #defines. We use asm_support_check.h to (safely) // generate CheckAsmSupportOffsetsAndSizes using gtest's EXPECT for the tests. We also use the // RETURN_TYPE, HEADER and FOOTER defines from asm_support_check.h to try to ensure that any diff --git a/runtime/arch/arm/entrypoints_init_arm.cc b/runtime/arch/arm/entrypoints_init_arm.cc index 8a8d26466f..090bab7e4b 100644 --- a/runtime/arch/arm/entrypoints_init_arm.cc +++ b/runtime/arch/arm/entrypoints_init_arm.cc @@ -19,13 +19,13 @@ #include "arch/arm/asm_support_arm.h" #include "base/bit_utils.h" +#include "entrypoints/entrypoint_utils.h" #include "entrypoints/jni/jni_entrypoints.h" +#include "entrypoints/math_entrypoints.h" #include "entrypoints/quick/quick_alloc_entrypoints.h" #include "entrypoints/quick/quick_default_externs.h" #include "entrypoints/quick/quick_default_init_entrypoints.h" #include "entrypoints/quick/quick_entrypoints.h" -#include "entrypoints/entrypoint_utils.h" -#include "entrypoints/math_entrypoints.h" #include "entrypoints/runtime_asm_entrypoints.h" #include "interpreter/interpreter.h" diff --git a/runtime/arch/arm/fault_handler_arm.cc b/runtime/arch/arm/fault_handler_arm.cc index b4bca014f4..5c313783be 100644 --- a/runtime/arch/arm/fault_handler_arm.cc +++ b/runtime/arch/arm/fault_handler_arm.cc @@ -14,7 +14,6 @@ * limitations under the License. */ - #include "fault_handler.h" #include <sys/ucontext.h> diff --git a/runtime/arch/arm/instruction_set_features_arm.cc b/runtime/arch/arm/instruction_set_features_arm.cc index 0942356b53..249696883a 100644 --- a/runtime/arch/arm/instruction_set_features_arm.cc +++ b/runtime/arch/arm/instruction_set_features_arm.cc @@ -17,11 +17,12 @@ #include "instruction_set_features_arm.h" #if defined(ART_TARGET_ANDROID) && defined(__arm__) -#include <sys/auxv.h> #include <asm/hwcap.h> +#include <sys/auxv.h> #endif #include "signal.h" + #include <fstream> #include "android-base/stringprintf.h" diff --git a/runtime/arch/arm64/entrypoints_init_arm64.cc b/runtime/arch/arm64/entrypoints_init_arm64.cc index 9bbcef307e..d270bdb3b7 100644 --- a/runtime/arch/arm64/entrypoints_init_arm64.cc +++ b/runtime/arch/arm64/entrypoints_init_arm64.cc @@ -19,13 +19,13 @@ #include "arch/arm64/asm_support_arm64.h" #include "base/bit_utils.h" +#include "entrypoints/entrypoint_utils.h" #include "entrypoints/jni/jni_entrypoints.h" +#include "entrypoints/math_entrypoints.h" #include "entrypoints/quick/quick_alloc_entrypoints.h" #include "entrypoints/quick/quick_default_externs.h" #include "entrypoints/quick/quick_default_init_entrypoints.h" #include "entrypoints/quick/quick_entrypoints.h" -#include "entrypoints/entrypoint_utils.h" -#include "entrypoints/math_entrypoints.h" #include "entrypoints/runtime_asm_entrypoints.h" #include "interpreter/interpreter.h" diff --git a/runtime/arch/arm64/fault_handler_arm64.cc b/runtime/arch/arm64/fault_handler_arm64.cc index 0ead732cdd..b9f9d551a9 100644 --- a/runtime/arch/arm64/fault_handler_arm64.cc +++ b/runtime/arch/arm64/fault_handler_arm64.cc @@ -14,7 +14,6 @@ * limitations under the License. */ - #include "fault_handler.h" #include <sys/ucontext.h> diff --git a/runtime/arch/instruction_set_features.cc b/runtime/arch/instruction_set_features.cc index 43c1711a72..ed8ff607a9 100644 --- a/runtime/arch/instruction_set_features.cc +++ b/runtime/arch/instruction_set_features.cc @@ -21,7 +21,6 @@ #include "base/casts.h" #include "utils.h" - #include "arm/instruction_set_features_arm.h" #include "arm64/instruction_set_features_arm64.h" #include "mips/instruction_set_features_mips.h" diff --git a/runtime/arch/memcmp16_test.cc b/runtime/arch/memcmp16_test.cc index 9ba7de1df5..2f3639c4b1 100644 --- a/runtime/arch/memcmp16_test.cc +++ b/runtime/arch/memcmp16_test.cc @@ -14,9 +14,10 @@ * limitations under the License. */ -#include "gtest/gtest.h" #include "memcmp16.h" +#include "gtest/gtest.h" + class RandGen { public: explicit RandGen(uint32_t seed) : val_(seed) {} diff --git a/runtime/arch/mips/entrypoints_init_mips.cc b/runtime/arch/mips/entrypoints_init_mips.cc index 3010246ac3..75cfc41028 100644 --- a/runtime/arch/mips/entrypoints_init_mips.cc +++ b/runtime/arch/mips/entrypoints_init_mips.cc @@ -18,12 +18,12 @@ #include "arch/mips/asm_support_mips.h" #include "atomic.h" +#include "entrypoints/entrypoint_utils.h" #include "entrypoints/jni/jni_entrypoints.h" +#include "entrypoints/math_entrypoints.h" #include "entrypoints/quick/quick_alloc_entrypoints.h" #include "entrypoints/quick/quick_default_externs.h" #include "entrypoints/quick/quick_entrypoints.h" -#include "entrypoints/entrypoint_utils.h" -#include "entrypoints/math_entrypoints.h" #include "entrypoints/runtime_asm_entrypoints.h" #include "entrypoints_direct_mips.h" #include "interpreter/interpreter.h" diff --git a/runtime/arch/mips/fault_handler_mips.cc b/runtime/arch/mips/fault_handler_mips.cc index 52a3df55d6..bf3e96a8ff 100644 --- a/runtime/arch/mips/fault_handler_mips.cc +++ b/runtime/arch/mips/fault_handler_mips.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "fault_handler.h" #include <sys/ucontext.h> +#include "fault_handler.h" #include "art_method.h" #include "base/callee_save_type.h" diff --git a/runtime/arch/mips64/entrypoints_init_mips64.cc b/runtime/arch/mips64/entrypoints_init_mips64.cc index 5e588274d8..15b3e38f8a 100644 --- a/runtime/arch/mips64/entrypoints_init_mips64.cc +++ b/runtime/arch/mips64/entrypoints_init_mips64.cc @@ -19,13 +19,13 @@ #include "arch/mips64/asm_support_mips64.h" #include "atomic.h" +#include "entrypoints/entrypoint_utils.h" #include "entrypoints/jni/jni_entrypoints.h" +#include "entrypoints/math_entrypoints.h" #include "entrypoints/quick/quick_alloc_entrypoints.h" #include "entrypoints/quick/quick_default_externs.h" #include "entrypoints/quick/quick_default_init_entrypoints.h" #include "entrypoints/quick/quick_entrypoints.h" -#include "entrypoints/entrypoint_utils.h" -#include "entrypoints/math_entrypoints.h" #include "entrypoints/runtime_asm_entrypoints.h" #include "interpreter/interpreter.h" diff --git a/runtime/arch/x86/fault_handler_x86.cc b/runtime/arch/x86/fault_handler_x86.cc index 798c500f18..349ce3bbe1 100644 --- a/runtime/arch/x86/fault_handler_x86.cc +++ b/runtime/arch/x86/fault_handler_x86.cc @@ -14,7 +14,6 @@ * limitations under the License. */ - #include "fault_handler.h" #include <sys/ucontext.h> diff --git a/runtime/arch/x86_64/entrypoints_init_x86_64.cc b/runtime/arch/x86_64/entrypoints_init_x86_64.cc index 1e56e8a087..5f7380f99d 100644 --- a/runtime/arch/x86_64/entrypoints_init_x86_64.cc +++ b/runtime/arch/x86_64/entrypoints_init_x86_64.cc @@ -17,13 +17,13 @@ #include <math.h> #include "entrypoints/jni/jni_entrypoints.h" +#include "entrypoints/math_entrypoints.h" #include "entrypoints/quick/quick_alloc_entrypoints.h" #include "entrypoints/quick/quick_default_externs.h" #if !defined(__APPLE__) #include "entrypoints/quick/quick_default_init_entrypoints.h" #endif #include "entrypoints/quick/quick_entrypoints.h" -#include "entrypoints/math_entrypoints.h" #include "entrypoints/runtime_asm_entrypoints.h" #include "interpreter/interpreter.h" diff --git a/runtime/art_field-inl.h b/runtime/art_field-inl.h index a8a58e135e..057f58c3a0 100644 --- a/runtime/art_field-inl.h +++ b/runtime/art_field-inl.h @@ -22,14 +22,14 @@ #include "base/logging.h" #include "class_linker.h" #include "dex_file-inl.h" -#include "gc_root-inl.h" #include "gc/accounting/card_table-inl.h" +#include "gc_root-inl.h" #include "jvalue.h" #include "mirror/dex_cache-inl.h" #include "mirror/object-inl.h" #include "primitive.h" -#include "thread-current-inl.h" #include "scoped_thread_state_change-inl.h" +#include "thread-current-inl.h" #include "well_known_classes.h" namespace art { diff --git a/runtime/art_method-inl.h b/runtime/art_method-inl.h index 4300544ea2..9a9f125718 100644 --- a/runtime/art_method-inl.h +++ b/runtime/art_method-inl.h @@ -24,9 +24,9 @@ #include "base/logging.h" #include "class_linker-inl.h" #include "common_throws.h" +#include "dex_file-inl.h" #include "dex_file.h" #include "dex_file_annotations.h" -#include "dex_file-inl.h" #include "gc_root-inl.h" #include "invoke_type.h" #include "jit/profiling_info.h" diff --git a/runtime/art_method.cc b/runtime/art_method.cc index d8984e8780..631f5e7250 100644 --- a/runtime/art_method.cc +++ b/runtime/art_method.cc @@ -38,8 +38,8 @@ #include "mirror/class-inl.h" #include "mirror/class_ext.h" #include "mirror/executable.h" -#include "mirror/object_array-inl.h" #include "mirror/object-inl.h" +#include "mirror/object_array-inl.h" #include "mirror/string.h" #include "oat_file-inl.h" #include "runtime_callbacks.h" diff --git a/runtime/asm_support_check.h b/runtime/asm_support_check.h index cc6a578313..3163506e72 100644 --- a/runtime/asm_support_check.h +++ b/runtime/asm_support_check.h @@ -28,10 +28,10 @@ #include "mirror/class.h" #include "mirror/dex_cache.h" #include "mirror/string.h" -#include "utils/dex_cache_arrays_layout.h" #include "runtime.h" #include "stack.h" #include "thread.h" +#include "utils/dex_cache_arrays_layout.h" #ifndef ADD_TEST_EQ #define ADD_TEST_EQ(x, y) CHECK_EQ(x, y); diff --git a/runtime/barrier_test.cc b/runtime/barrier_test.cc index 25b6925fd8..ecdabba8a5 100644 --- a/runtime/barrier_test.cc +++ b/runtime/barrier_test.cc @@ -21,8 +21,8 @@ #include "atomic.h" #include "common_runtime_test.h" #include "mirror/object_array-inl.h" -#include "thread_pool.h" #include "thread-current-inl.h" +#include "thread_pool.h" namespace art { class CheckWaitTask : public Task { diff --git a/runtime/base/arena_allocator.cc b/runtime/base/arena_allocator.cc index 54b40f28cf..148ef86059 100644 --- a/runtime/base/arena_allocator.cc +++ b/runtime/base/arena_allocator.cc @@ -26,8 +26,8 @@ #include "logging.h" #include "mem_map.h" #include "mutex.h" -#include "thread-current-inl.h" #include "systrace.h" +#include "thread-current-inl.h" namespace art { diff --git a/runtime/base/arena_allocator.h b/runtime/base/arena_allocator.h index a484c5c105..0b1a3bac9c 100644 --- a/runtime/base/arena_allocator.h +++ b/runtime/base/arena_allocator.h @@ -17,8 +17,8 @@ #ifndef ART_RUNTIME_BASE_ARENA_ALLOCATOR_H_ #define ART_RUNTIME_BASE_ARENA_ALLOCATOR_H_ -#include <stdint.h> #include <stddef.h> +#include <stdint.h> #include "base/bit_utils.h" #include "base/dchecked_vector.h" diff --git a/runtime/base/array_slice.h b/runtime/base/array_slice.h index 0da977d97d..a7bce7dc56 100644 --- a/runtime/base/array_slice.h +++ b/runtime/base/array_slice.h @@ -17,10 +17,10 @@ #ifndef ART_RUNTIME_BASE_ARRAY_SLICE_H_ #define ART_RUNTIME_BASE_ARRAY_SLICE_H_ -#include "stride_iterator.h" #include "base/bit_utils.h" #include "base/casts.h" #include "base/iteration_range.h" +#include "stride_iterator.h" namespace art { diff --git a/runtime/base/casts.h b/runtime/base/casts.h index c5b0af665b..0cbabba6df 100644 --- a/runtime/base/casts.h +++ b/runtime/base/casts.h @@ -18,9 +18,10 @@ #define ART_RUNTIME_BASE_CASTS_H_ #include <assert.h> -#include <limits> #include <stdint.h> #include <string.h> + +#include <limits> #include <type_traits> #include "base/logging.h" diff --git a/runtime/base/hash_set.h b/runtime/base/hash_set.h index a22efcfe32..c472a9ee03 100644 --- a/runtime/base/hash_set.h +++ b/runtime/base/hash_set.h @@ -17,10 +17,11 @@ #ifndef ART_RUNTIME_BASE_HASH_SET_H_ #define ART_RUNTIME_BASE_HASH_SET_H_ +#include <stdint.h> + #include <functional> #include <iterator> #include <memory> -#include <stdint.h> #include <utility> #include "bit_utils.h" diff --git a/runtime/base/hash_set_test.cc b/runtime/base/hash_set_test.cc index 825406313a..31b28ebf5a 100644 --- a/runtime/base/hash_set_test.cc +++ b/runtime/base/hash_set_test.cc @@ -16,8 +16,8 @@ #include "hash_set.h" -#include <map> #include <forward_list> +#include <map> #include <sstream> #include <string> #include <unordered_set> diff --git a/runtime/base/histogram.h b/runtime/base/histogram.h index 0e3bc8e1b4..e0c921e408 100644 --- a/runtime/base/histogram.h +++ b/runtime/base/histogram.h @@ -16,8 +16,8 @@ #ifndef ART_RUNTIME_BASE_HISTOGRAM_H_ #define ART_RUNTIME_BASE_HISTOGRAM_H_ -#include <vector> #include <string> +#include <vector> #include "base/logging.h" diff --git a/runtime/base/length_prefixed_array.h b/runtime/base/length_prefixed_array.h index a570b819ba..2df5a99352 100644 --- a/runtime/base/length_prefixed_array.h +++ b/runtime/base/length_prefixed_array.h @@ -20,10 +20,10 @@ #include <stddef.h> // for offsetof() #include <string.h> // for memset() -#include "stride_iterator.h" #include "base/bit_utils.h" #include "base/casts.h" #include "base/iteration_range.h" +#include "stride_iterator.h" namespace art { diff --git a/runtime/base/memory_tool.h b/runtime/base/memory_tool.h index 42cbaa0389..223c1debdd 100644 --- a/runtime/base/memory_tool.h +++ b/runtime/base/memory_tool.h @@ -52,8 +52,8 @@ constexpr size_t kMemoryToolStackGuardSizeScale = 2; #else -#include <valgrind.h> #include <memcheck/memcheck.h> +#include <valgrind.h> #define MEMORY_TOOL_MAKE_NOACCESS(p, s) VALGRIND_MAKE_MEM_NOACCESS(p, s) #define MEMORY_TOOL_MAKE_UNDEFINED(p, s) VALGRIND_MAKE_MEM_UNDEFINED(p, s) #define MEMORY_TOOL_MAKE_DEFINED(p, s) VALGRIND_MAKE_MEM_DEFINED(p, s) diff --git a/runtime/base/mutex.cc b/runtime/base/mutex.cc index 03dda12f24..6392198bdd 100644 --- a/runtime/base/mutex.cc +++ b/runtime/base/mutex.cc @@ -23,8 +23,8 @@ #include "atomic.h" #include "base/logging.h" -#include "base/time_utils.h" #include "base/systrace.h" +#include "base/time_utils.h" #include "base/value_object.h" #include "mutex-inl.h" #include "scoped_thread_state_change-inl.h" diff --git a/runtime/base/safe_copy.cc b/runtime/base/safe_copy.cc index 06249acb44..c76ea113d8 100644 --- a/runtime/base/safe_copy.cc +++ b/runtime/base/safe_copy.cc @@ -16,9 +16,9 @@ #include "safe_copy.h" -#include <unistd.h> #include <sys/uio.h> #include <sys/user.h> +#include <unistd.h> #include <algorithm> diff --git a/runtime/base/scoped_arena_containers.h b/runtime/base/scoped_arena_containers.h index 7964705993..4a6c9076af 100644 --- a/runtime/base/scoped_arena_containers.h +++ b/runtime/base/scoped_arena_containers.h @@ -26,8 +26,8 @@ #include "arena_containers.h" // For ArenaAllocatorAdapterKind. #include "base/dchecked_vector.h" -#include "scoped_arena_allocator.h" #include "safe_map.h" +#include "scoped_arena_allocator.h" namespace art { diff --git a/runtime/base/systrace.h b/runtime/base/systrace.h index 3901f96b45..06db48a576 100644 --- a/runtime/base/systrace.h +++ b/runtime/base/systrace.h @@ -19,9 +19,10 @@ #define ATRACE_TAG ATRACE_TAG_DALVIK #include <cutils/trace.h> -#include <string> #include <utils/Trace.h> +#include <string> + namespace art { class ScopedTrace { diff --git a/runtime/base/time_utils.h b/runtime/base/time_utils.h index dbb8bcd4d7..919937f5ba 100644 --- a/runtime/base/time_utils.h +++ b/runtime/base/time_utils.h @@ -18,9 +18,10 @@ #define ART_RUNTIME_BASE_TIME_UTILS_H_ #include <stdint.h> -#include <string> #include <time.h> +#include <string> + #include "base/macros.h" namespace art { diff --git a/runtime/base/timing_logger.cc b/runtime/base/timing_logger.cc index aaa24317bb..b2e5251e73 100644 --- a/runtime/base/timing_logger.cc +++ b/runtime/base/timing_logger.cc @@ -14,14 +14,13 @@ * limitations under the License. */ - #include <stdio.h> #include "timing_logger.h" +#include "base/histogram-inl.h" #include "base/logging.h" #include "base/stl_util.h" -#include "base/histogram-inl.h" #include "base/systrace.h" #include "base/time_utils.h" #include "gc/heap.h" diff --git a/runtime/base/unix_file/fd_file.cc b/runtime/base/unix_file/fd_file.cc index 00b5567012..0c73ce7ef2 100644 --- a/runtime/base/unix_file/fd_file.cc +++ b/runtime/base/unix_file/fd_file.cc @@ -17,11 +17,12 @@ #include "base/unix_file/fd_file.h" #include <errno.h> -#include <limits> #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> +#include <limits> + #include "base/logging.h" // Includes needed for FdFile::Copy(). diff --git a/runtime/base/unix_file/fd_file.h b/runtime/base/unix_file/fd_file.h index eb85c4f097..e07c3fd800 100644 --- a/runtime/base/unix_file/fd_file.h +++ b/runtime/base/unix_file/fd_file.h @@ -21,8 +21,8 @@ #include <string> -#include "base/unix_file/random_access_file.h" #include "base/macros.h" +#include "base/unix_file/random_access_file.h" namespace unix_file { diff --git a/runtime/base/unix_file/random_access_file_utils.cc b/runtime/base/unix_file/random_access_file_utils.cc index df3b308bb0..aae65c1cde 100644 --- a/runtime/base/unix_file/random_access_file_utils.cc +++ b/runtime/base/unix_file/random_access_file_utils.cc @@ -14,8 +14,10 @@ * limitations under the License. */ -#include <vector> #include "base/unix_file/random_access_file_utils.h" + +#include <vector> + #include "base/unix_file/random_access_file.h" namespace unix_file { diff --git a/runtime/bytecode_utils.h b/runtime/bytecode_utils.h index fa87b1d6da..b6a3c03191 100644 --- a/runtime/bytecode_utils.h +++ b/runtime/bytecode_utils.h @@ -18,8 +18,8 @@ #define ART_RUNTIME_BYTECODE_UTILS_H_ #include "base/arena_object.h" -#include "dex_file.h" #include "dex_file-inl.h" +#include "dex_file.h" #include "dex_instruction-inl.h" namespace art { diff --git a/runtime/cha.h b/runtime/cha.h index 81458db601..1af3161b6f 100644 --- a/runtime/cha.h +++ b/runtime/cha.h @@ -17,13 +17,14 @@ #ifndef ART_RUNTIME_CHA_H_ #define ART_RUNTIME_CHA_H_ +#include <unordered_map> +#include <unordered_set> + #include "base/enums.h" #include "base/mutex.h" #include "handle.h" #include "mirror/class.h" #include "oat_quick_method_header.h" -#include <unordered_map> -#include <unordered_set> namespace art { diff --git a/runtime/check_jni.cc b/runtime/check_jni.cc index 1c3328e484..c3dd702446 100644 --- a/runtime/check_jni.cc +++ b/runtime/check_jni.cc @@ -16,18 +16,19 @@ #include "check_jni.h" -#include <iomanip> #include <sys/mman.h> #include <zlib.h> +#include <iomanip> + #include "android-base/stringprintf.h" #include "art_field-inl.h" #include "art_method-inl.h" #include "base/logging.h" #include "base/to_str.h" -#include "class_linker.h" #include "class_linker-inl.h" +#include "class_linker.h" #include "dex_file-inl.h" #include "gc/space/space.h" #include "java_vm_ext.h" diff --git a/runtime/class_linker-inl.h b/runtime/class_linker-inl.h index 9a736973bc..0096c37b33 100644 --- a/runtime/class_linker-inl.h +++ b/runtime/class_linker-inl.h @@ -19,14 +19,14 @@ #include "art_field.h" #include "class_linker.h" -#include "gc_root-inl.h" #include "gc/heap-inl.h" -#include "obj_ptr-inl.h" +#include "gc_root-inl.h" +#include "handle_scope-inl.h" #include "mirror/class_loader.h" #include "mirror/dex_cache-inl.h" #include "mirror/iftable.h" #include "mirror/object_array-inl.h" -#include "handle_scope-inl.h" +#include "obj_ptr-inl.h" #include "scoped_thread_state_change-inl.h" #include <atomic> diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc index 9e3e76ce18..c5e11f134e 100644 --- a/runtime/class_linker.cc +++ b/runtime/class_linker.cc @@ -16,6 +16,8 @@ #include "class_linker.h" +#include <unistd.h> + #include <algorithm> #include <deque> #include <iostream> @@ -24,7 +26,6 @@ #include <queue> #include <string> #include <tuple> -#include <unistd.h> #include <unordered_map> #include <utility> #include <vector> diff --git a/runtime/class_linker_test.cc b/runtime/class_linker_test.cc index 39d77f07de..5e9707c062 100644 --- a/runtime/class_linker_test.cc +++ b/runtime/class_linker_test.cc @@ -28,9 +28,10 @@ #include "common_runtime_test.h" #include "dex_file.h" #include "dex_file_types.h" -#include "experimental_flags.h" #include "entrypoints/entrypoint_utils-inl.h" +#include "experimental_flags.h" #include "gc/heap.h" +#include "handle_scope-inl.h" #include "mirror/accessible_object.h" #include "mirror/call_site.h" #include "mirror/class-inl.h" @@ -39,16 +40,15 @@ #include "mirror/emulated_stack_frame.h" #include "mirror/executable.h" #include "mirror/field.h" -#include "mirror/method_type.h" #include "mirror/method_handle_impl.h" #include "mirror/method_handles_lookup.h" +#include "mirror/method_type.h" #include "mirror/object-inl.h" #include "mirror/object_array-inl.h" #include "mirror/proxy.h" #include "mirror/reference.h" #include "mirror/stack_trace_element.h" #include "mirror/string-inl.h" -#include "handle_scope-inl.h" #include "scoped_thread_state_change-inl.h" #include "thread-current-inl.h" diff --git a/runtime/class_loader_context_test.cc b/runtime/class_loader_context_test.cc index a87552d5dc..5655aecbe5 100644 --- a/runtime/class_loader_context_test.cc +++ b/runtime/class_loader_context_test.cc @@ -16,7 +16,6 @@ #include <gtest/gtest.h> - #include "class_loader_context.h" #include "common_runtime_test.h" diff --git a/runtime/common_runtime_test.cc b/runtime/common_runtime_test.cc index 7e762c33f2..29b376a21c 100644 --- a/runtime/common_runtime_test.cc +++ b/runtime/common_runtime_test.cc @@ -16,12 +16,12 @@ #include "common_runtime_test.h" -#include <cstdio> #include <dirent.h> #include <dlfcn.h> #include <fcntl.h> -#include "nativehelper/ScopedLocalRef.h" #include <stdlib.h> +#include <cstdio> +#include "nativehelper/ScopedLocalRef.h" #include "../../external/icu/icu4c/source/common/unicode/uvernum.h" #include "android-base/stringprintf.h" diff --git a/runtime/debugger.h b/runtime/debugger.h index 4f3ff40e86..0be46d6b8f 100644 --- a/runtime/debugger.h +++ b/runtime/debugger.h @@ -27,8 +27,8 @@ #include <string> #include <vector> -#include "gc_root.h" #include "class_linker.h" +#include "gc_root.h" #include "handle.h" #include "jdwp/jdwp.h" #include "jni.h" diff --git a/runtime/dex_file_verifier_test.cc b/runtime/dex_file_verifier_test.cc index 0e58e6d564..e2770d1464 100644 --- a/runtime/dex_file_verifier_test.cc +++ b/runtime/dex_file_verifier_test.cc @@ -16,14 +16,15 @@ #include "dex_file_verifier.h" -#include "sys/mman.h" -#include "zlib.h" +#include <sys/mman.h> +#include <zlib.h> + #include <functional> #include <memory> -#include "base/unix_file/fd_file.h" #include "base/bit_utils.h" #include "base/macros.h" +#include "base/unix_file/fd_file.h" #include "common_runtime_test.h" #include "dex_file-inl.h" #include "dex_file_types.h" diff --git a/runtime/dex_reference_collection.h b/runtime/dex_reference_collection.h index 01b9b97786..047771f4a5 100644 --- a/runtime/dex_reference_collection.h +++ b/runtime/dex_reference_collection.h @@ -17,10 +17,10 @@ #ifndef ART_RUNTIME_DEX_REFERENCE_COLLECTION_H_ #define ART_RUNTIME_DEX_REFERENCE_COLLECTION_H_ -#include "base/macros.h" - -#include <vector> #include <map> +#include <vector> + +#include "base/macros.h" namespace art { diff --git a/runtime/entrypoints/entrypoint_utils.h b/runtime/entrypoints/entrypoint_utils.h index fe85887f05..4f9090815f 100644 --- a/runtime/entrypoints/entrypoint_utils.h +++ b/runtime/entrypoints/entrypoint_utils.h @@ -23,8 +23,8 @@ #include "base/callee_save_type.h" #include "base/macros.h" #include "base/mutex.h" -#include "dex_instruction.h" #include "dex_file_types.h" +#include "dex_instruction.h" #include "gc/allocator_type.h" #include "handle.h" #include "invoke_type.h" diff --git a/runtime/entrypoints/quick/quick_alloc_entrypoints.cc b/runtime/entrypoints/quick/quick_alloc_entrypoints.cc index 582f0cff48..b8d96af3fb 100644 --- a/runtime/entrypoints/quick/quick_alloc_entrypoints.cc +++ b/runtime/entrypoints/quick/quick_alloc_entrypoints.cc @@ -22,8 +22,8 @@ #include "dex_file_types.h" #include "entrypoints/entrypoint_utils-inl.h" #include "mirror/class-inl.h" -#include "mirror/object_array-inl.h" #include "mirror/object-inl.h" +#include "mirror/object_array-inl.h" namespace art { diff --git a/runtime/entrypoints/quick/quick_dexcache_entrypoints.cc b/runtime/entrypoints/quick/quick_dexcache_entrypoints.cc index fe565430fe..a2a6e085c2 100644 --- a/runtime/entrypoints/quick/quick_dexcache_entrypoints.cc +++ b/runtime/entrypoints/quick/quick_dexcache_entrypoints.cc @@ -17,16 +17,16 @@ #include "art_method-inl.h" #include "base/callee_save_type.h" #include "callee_save_frame.h" -#include "entrypoints/entrypoint_utils-inl.h" #include "class_linker-inl.h" #include "class_table-inl.h" #include "dex_file-inl.h" #include "dex_file_types.h" +#include "entrypoints/entrypoint_utils-inl.h" #include "gc/heap.h" #include "mirror/class-inl.h" #include "mirror/class_loader.h" -#include "mirror/object_array-inl.h" #include "mirror/object-inl.h" +#include "mirror/object_array-inl.h" #include "oat_file.h" #include "runtime.h" diff --git a/runtime/entrypoints/quick/quick_entrypoints_enum.h b/runtime/entrypoints/quick/quick_entrypoints_enum.h index abf2c34744..1cf7f8daeb 100644 --- a/runtime/entrypoints/quick/quick_entrypoints_enum.h +++ b/runtime/entrypoints/quick/quick_entrypoints_enum.h @@ -24,8 +24,7 @@ namespace art { // Define an enum for the entrypoints. Names are prepended a 'kQuick'. -enum QuickEntrypointEnum -{ // NOLINT(whitespace/braces) +enum QuickEntrypointEnum { // NOLINT(whitespace/braces) #define ENTRYPOINT_ENUM(name, rettype, ...) kQuick ## name, #include "quick_entrypoints_list.h" QUICK_ENTRYPOINT_LIST(ENTRYPOINT_ENUM) @@ -58,7 +57,7 @@ void CheckEntrypointTypes(); #define ENTRYPOINT_ENUM(name, ...) \ template <> inline void CheckEntrypointTypes<kQuick ## name, __VA_ARGS__>() {}; // NOLINT [readability/braces] [4] #include "quick_entrypoints_list.h" - QUICK_ENTRYPOINT_LIST(ENTRYPOINT_ENUM) +QUICK_ENTRYPOINT_LIST(ENTRYPOINT_ENUM) #undef QUICK_ENTRYPOINT_LIST #undef ENTRYPOINT_ENUM diff --git a/runtime/entrypoints/quick/quick_fillarray_entrypoints.cc b/runtime/entrypoints/quick/quick_fillarray_entrypoints.cc index f63c9c2599..d4bc1c76b1 100644 --- a/runtime/entrypoints/quick/quick_fillarray_entrypoints.cc +++ b/runtime/entrypoints/quick/quick_fillarray_entrypoints.cc @@ -16,8 +16,8 @@ #include "art_method-inl.h" #include "callee_save_frame.h" -#include "mirror/array.h" #include "entrypoints/entrypoint_utils.h" +#include "mirror/array.h" namespace art { diff --git a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc index 3061365685..6250d9f56c 100644 --- a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc +++ b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc @@ -27,8 +27,8 @@ #include "gc/accounting/card_table-inl.h" #include "imt_conflict_table.h" #include "imtable-inl.h" -#include "interpreter/interpreter.h" #include "instrumentation.h" +#include "interpreter/interpreter.h" #include "linear_alloc.h" #include "method_bss_mapping.h" #include "method_handles.h" diff --git a/runtime/entrypoints_order_test.cc b/runtime/entrypoints_order_test.cc index a3c3981b42..281dfd9725 100644 --- a/runtime/entrypoints_order_test.cc +++ b/runtime/entrypoints_order_test.cc @@ -14,9 +14,10 @@ * limitations under the License. */ -#include <memory> #include <setjmp.h> +#include <memory> + #include "base/macros.h" #include "common_runtime_test.h" #include "thread.h" diff --git a/runtime/fault_handler.h b/runtime/fault_handler.h index d56cf17861..3e2664c7f9 100644 --- a/runtime/fault_handler.h +++ b/runtime/fault_handler.h @@ -18,12 +18,13 @@ #ifndef ART_RUNTIME_FAULT_HANDLER_H_ #define ART_RUNTIME_FAULT_HANDLER_H_ -#include <signal.h> -#include <vector> #include <setjmp.h> +#include <signal.h> #include <stdint.h> -#include "base/mutex.h" // For annotalysis. +#include <vector> + +#include "base/mutex.h" // For annotalysis. namespace art { diff --git a/runtime/gc/accounting/mod_union_table.h b/runtime/gc/accounting/mod_union_table.h index 9e261fd8b5..ee25eae93a 100644 --- a/runtime/gc/accounting/mod_union_table.h +++ b/runtime/gc/accounting/mod_union_table.h @@ -17,8 +17,8 @@ #ifndef ART_RUNTIME_GC_ACCOUNTING_MOD_UNION_TABLE_H_ #define ART_RUNTIME_GC_ACCOUNTING_MOD_UNION_TABLE_H_ -#include "bitmap.h" #include "base/allocator.h" +#include "bitmap.h" #include "card_table.h" #include "globals.h" #include "mirror/object_reference.h" diff --git a/runtime/gc/accounting/remembered_set.cc b/runtime/gc/accounting/remembered_set.cc index f2fe58aa83..9dea2f80d1 100644 --- a/runtime/gc/accounting/remembered_set.cc +++ b/runtime/gc/accounting/remembered_set.cc @@ -20,12 +20,12 @@ #include "base/stl_util.h" #include "card_table-inl.h" -#include "heap_bitmap.h" -#include "gc/collector/mark_sweep.h" #include "gc/collector/mark_sweep-inl.h" +#include "gc/collector/mark_sweep.h" #include "gc/collector/semi_space.h" #include "gc/heap.h" #include "gc/space/space.h" +#include "heap_bitmap.h" #include "mirror/class-inl.h" #include "mirror/object-inl.h" #include "mirror/object-refvisitor-inl.h" diff --git a/runtime/gc/accounting/space_bitmap.cc b/runtime/gc/accounting/space_bitmap.cc index 317e2fc591..92b4360123 100644 --- a/runtime/gc/accounting/space_bitmap.cc +++ b/runtime/gc/accounting/space_bitmap.cc @@ -21,8 +21,8 @@ #include "art_field-inl.h" #include "dex_file-inl.h" #include "mem_map.h" -#include "mirror/object-inl.h" #include "mirror/class-inl.h" +#include "mirror/object-inl.h" #include "mirror/object_array.h" namespace art { diff --git a/runtime/gc/allocation_listener.h b/runtime/gc/allocation_listener.h index 21fa2142df..0be9aecae4 100644 --- a/runtime/gc/allocation_listener.h +++ b/runtime/gc/allocation_listener.h @@ -22,8 +22,8 @@ #include "base/macros.h" #include "base/mutex.h" -#include "obj_ptr.h" #include "gc_root.h" +#include "obj_ptr.h" namespace art { diff --git a/runtime/gc/allocation_record.h b/runtime/gc/allocation_record.h index d31e442cc9..fcd08c1b7b 100644 --- a/runtime/gc/allocation_record.h +++ b/runtime/gc/allocation_record.h @@ -21,8 +21,8 @@ #include <memory> #include "base/mutex.h" -#include "obj_ptr.h" #include "gc_root.h" +#include "obj_ptr.h" namespace art { diff --git a/runtime/gc/allocator/dlmalloc.cc b/runtime/gc/allocator/dlmalloc.cc index 0c84224fcb..ef916f8745 100644 --- a/runtime/gc/allocator/dlmalloc.cc +++ b/runtime/gc/allocator/dlmalloc.cc @@ -55,9 +55,10 @@ static void art_heap_usage_error(const char* function, void* p) { << " not expected"; } +#include <sys/mman.h> + #include "globals.h" #include "utils.h" -#include <sys/mman.h> extern "C" void DlmallocMadviseCallback(void* start, void* end, size_t used_bytes, void* arg) { // Is this chunk in use? diff --git a/runtime/gc/allocator/rosalloc.cc b/runtime/gc/allocator/rosalloc.cc index d5d3540b1f..b742ac4a7c 100644 --- a/runtime/gc/allocator/rosalloc.cc +++ b/runtime/gc/allocator/rosalloc.cc @@ -16,8 +16,8 @@ #include "rosalloc.h" -#include <map> #include <list> +#include <map> #include <sstream> #include <vector> @@ -28,8 +28,8 @@ #include "gc/space/memory_tool_settings.h" #include "mem_map.h" #include "mirror/class-inl.h" -#include "mirror/object.h" #include "mirror/object-inl.h" +#include "mirror/object.h" #include "thread-current-inl.h" #include "thread_list.h" diff --git a/runtime/gc/allocator/rosalloc.h b/runtime/gc/allocator/rosalloc.h index b85d7dff5c..2c90773b8f 100644 --- a/runtime/gc/allocator/rosalloc.h +++ b/runtime/gc/allocator/rosalloc.h @@ -28,8 +28,8 @@ #include "base/allocator.h" #include "base/bit_utils.h" -#include "base/mutex.h" #include "base/logging.h" +#include "base/mutex.h" #include "globals.h" #include "thread.h" diff --git a/runtime/gc/collector/concurrent_copying.h b/runtime/gc/collector/concurrent_copying.h index ab609906bf..cc7072d9da 100644 --- a/runtime/gc/collector/concurrent_copying.h +++ b/runtime/gc/collector/concurrent_copying.h @@ -21,8 +21,8 @@ #include "garbage_collector.h" #include "immune_spaces.h" #include "jni.h" -#include "offsets.h" #include "mirror/object_reference.h" +#include "offsets.h" #include "safe_map.h" #include <unordered_map> diff --git a/runtime/gc/collector/immune_spaces.cc b/runtime/gc/collector/immune_spaces.cc index 1e5f28382b..1024050409 100644 --- a/runtime/gc/collector/immune_spaces.cc +++ b/runtime/gc/collector/immune_spaces.cc @@ -16,8 +16,8 @@ #include "immune_spaces.h" -#include <vector> #include <tuple> +#include <vector> #include "gc/space/space-inl.h" #include "mirror/object.h" diff --git a/runtime/gc/collector/iteration.h b/runtime/gc/collector/iteration.h index fbe41664f7..363459a7f0 100644 --- a/runtime/gc/collector/iteration.h +++ b/runtime/gc/collector/iteration.h @@ -22,6 +22,7 @@ #include "android-base/macros.h" #include "base/timing_logger.h" +#include "gc/gc_cause.h" #include "object_byte_pair.h" namespace art { diff --git a/runtime/gc/collector/mark_compact.h b/runtime/gc/collector/mark_compact.h index 0bf4095ac3..7d64a0c64a 100644 --- a/runtime/gc/collector/mark_compact.h +++ b/runtime/gc/collector/mark_compact.h @@ -24,8 +24,8 @@ #include "base/macros.h" #include "base/mutex.h" #include "garbage_collector.h" -#include "gc_root.h" #include "gc/accounting/heap_bitmap.h" +#include "gc_root.h" #include "immune_spaces.h" #include "lock_word.h" #include "offsets.h" diff --git a/runtime/gc/collector/mark_sweep.cc b/runtime/gc/collector/mark_sweep.cc index fb82b4d270..34de83a240 100644 --- a/runtime/gc/collector/mark_sweep.cc +++ b/runtime/gc/collector/mark_sweep.cc @@ -17,9 +17,9 @@ #include "mark_sweep.h" #include <atomic> +#include <climits> #include <functional> #include <numeric> -#include <climits> #include <vector> #include "base/bounded_fifo.h" diff --git a/runtime/gc/collector/mark_sweep.h b/runtime/gc/collector/mark_sweep.h index b9e06f9688..53b899e09e 100644 --- a/runtime/gc/collector/mark_sweep.h +++ b/runtime/gc/collector/mark_sweep.h @@ -24,8 +24,8 @@ #include "base/macros.h" #include "base/mutex.h" #include "garbage_collector.h" -#include "gc_root.h" #include "gc/accounting/heap_bitmap.h" +#include "gc_root.h" #include "immune_spaces.h" #include "offsets.h" diff --git a/runtime/gc/collector/semi_space.cc b/runtime/gc/collector/semi_space.cc index d3798924ee..9fb37b6138 100644 --- a/runtime/gc/collector/semi_space.cc +++ b/runtime/gc/collector/semi_space.cc @@ -32,8 +32,8 @@ #include "gc/accounting/space_bitmap-inl.h" #include "gc/heap.h" #include "gc/reference_processor.h" -#include "gc/space/bump_pointer_space.h" #include "gc/space/bump_pointer_space-inl.h" +#include "gc/space/bump_pointer_space.h" #include "gc/space/image_space.h" #include "gc/space/large_object_space.h" #include "gc/space/space-inl.h" @@ -41,10 +41,10 @@ #include "intern_table.h" #include "jni_internal.h" #include "mark_sweep-inl.h" -#include "monitor.h" -#include "mirror/reference-inl.h" #include "mirror/object-inl.h" #include "mirror/object-refvisitor-inl.h" +#include "mirror/reference-inl.h" +#include "monitor.h" #include "runtime.h" #include "thread-inl.h" #include "thread_list.h" diff --git a/runtime/gc/collector/semi_space.h b/runtime/gc/collector/semi_space.h index d3858baaf5..fd52da3947 100644 --- a/runtime/gc/collector/semi_space.h +++ b/runtime/gc/collector/semi_space.h @@ -23,8 +23,8 @@ #include "base/macros.h" #include "base/mutex.h" #include "garbage_collector.h" -#include "gc_root.h" #include "gc/accounting/heap_bitmap.h" +#include "gc_root.h" #include "immune_spaces.h" #include "mirror/object_reference.h" #include "offsets.h" diff --git a/runtime/gc/gc_cause.cc b/runtime/gc/gc_cause.cc index a3a2051934..871208037a 100644 --- a/runtime/gc/gc_cause.cc +++ b/runtime/gc/gc_cause.cc @@ -15,8 +15,8 @@ */ #include "gc_cause.h" -#include "globals.h" #include "base/logging.h" +#include "globals.h" #include <ostream> diff --git a/runtime/gc/heap-inl.h b/runtime/gc/heap-inl.h index bf5cf29f13..2047646413 100644 --- a/runtime/gc/heap-inl.h +++ b/runtime/gc/heap-inl.h @@ -30,9 +30,9 @@ #include "gc/space/large_object_space.h" #include "gc/space/region_space-inl.h" #include "gc/space/rosalloc_space-inl.h" +#include "handle_scope-inl.h" #include "obj_ptr-inl.h" #include "runtime.h" -#include "handle_scope-inl.h" #include "thread-inl.h" #include "utils.h" #include "verify_object.h" diff --git a/runtime/gc/heap.h b/runtime/gc/heap.h index e172d2d825..1534fd69d1 100644 --- a/runtime/gc/heap.h +++ b/runtime/gc/heap.h @@ -27,10 +27,10 @@ #include "atomic.h" #include "base/mutex.h" #include "base/time_utils.h" -#include "gc/gc_cause.h" #include "gc/collector/gc_type.h" #include "gc/collector/iteration.h" #include "gc/collector_type.h" +#include "gc/gc_cause.h" #include "gc/space/large_object_space.h" #include "globals.h" #include "handle.h" diff --git a/runtime/gc/reference_queue_test.cc b/runtime/gc/reference_queue_test.cc index 613b034f59..ce0807c0c6 100644 --- a/runtime/gc/reference_queue_test.cc +++ b/runtime/gc/reference_queue_test.cc @@ -17,9 +17,9 @@ #include <sstream> #include "common_runtime_test.h" -#include "reference_queue.h" #include "handle_scope-inl.h" #include "mirror/class-inl.h" +#include "reference_queue.h" #include "scoped_thread_state_change-inl.h" namespace art { diff --git a/runtime/gc/space/bump_pointer_space.cc b/runtime/gc/space/bump_pointer_space.cc index 5d91f4bf8e..ce0e0f3630 100644 --- a/runtime/gc/space/bump_pointer_space.cc +++ b/runtime/gc/space/bump_pointer_space.cc @@ -16,8 +16,8 @@ #include "bump_pointer_space.h" #include "bump_pointer_space-inl.h" -#include "mirror/object-inl.h" #include "mirror/class-inl.h" +#include "mirror/object-inl.h" #include "thread_list.h" namespace art { diff --git a/runtime/gc/space/image_space.cc b/runtime/gc/space/image_space.cc index fe0d35f455..148438296f 100644 --- a/runtime/gc/space/image_space.cc +++ b/runtime/gc/space/image_space.cc @@ -17,11 +17,12 @@ #include "image_space.h" #include <lz4.h> -#include <random> #include <sys/statvfs.h> #include <sys/types.h> #include <unistd.h> +#include <random> + #include "android-base/stringprintf.h" #include "android-base/strings.h" @@ -30,8 +31,8 @@ #include "base/callee_save_type.h" #include "base/enums.h" #include "base/macros.h" -#include "base/stl_util.h" #include "base/scoped_flock.h" +#include "base/stl_util.h" #include "base/systrace.h" #include "base/time_utils.h" #include "exec_utils.h" diff --git a/runtime/gc/space/large_object_space_test.cc b/runtime/gc/space/large_object_space_test.cc index 2544914a95..79b775a510 100644 --- a/runtime/gc/space/large_object_space_test.cc +++ b/runtime/gc/space/large_object_space_test.cc @@ -14,9 +14,10 @@ * limitations under the License. */ +#include "large_object_space.h" + #include "base/time_utils.h" #include "space_test.h" -#include "large_object_space.h" namespace art { namespace gc { diff --git a/runtime/gc/space/malloc_space.cc b/runtime/gc/space/malloc_space.cc index 1154620bb7..c2a8de3aec 100644 --- a/runtime/gc/space/malloc_space.cc +++ b/runtime/gc/space/malloc_space.cc @@ -23,10 +23,10 @@ #include "gc/heap.h" #include "gc/space/space-inl.h" #include "gc/space/zygote_space.h" +#include "handle_scope-inl.h" #include "mirror/class-inl.h" #include "mirror/object-inl.h" #include "runtime.h" -#include "handle_scope-inl.h" #include "thread.h" #include "thread_list.h" #include "utils.h" diff --git a/runtime/gc/space/memory_tool_malloc_space-inl.h b/runtime/gc/space/memory_tool_malloc_space-inl.h index 6cb2465539..8282f3dda7 100644 --- a/runtime/gc/space/memory_tool_malloc_space-inl.h +++ b/runtime/gc/space/memory_tool_malloc_space-inl.h @@ -17,9 +17,11 @@ #ifndef ART_RUNTIME_GC_SPACE_MEMORY_TOOL_MALLOC_SPACE_INL_H_ #define ART_RUNTIME_GC_SPACE_MEMORY_TOOL_MALLOC_SPACE_INL_H_ -#include "base/memory_tool.h" #include "memory_tool_malloc_space.h" + +#include "base/memory_tool.h" #include "memory_tool_settings.h" +#include "mirror/object-inl.h" namespace art { namespace gc { diff --git a/runtime/gc/space/region_space.cc b/runtime/gc/space/region_space.cc index fe3c1c022c..b2e1fa5269 100644 --- a/runtime/gc/space/region_space.cc +++ b/runtime/gc/space/region_space.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "bump_pointer_space.h" #include "bump_pointer_space-inl.h" +#include "bump_pointer_space.h" #include "gc/accounting/read_barrier_table.h" -#include "mirror/object-inl.h" #include "mirror/class-inl.h" +#include "mirror/object-inl.h" #include "thread_list.h" namespace art { diff --git a/runtime/gc/space/rosalloc_space.cc b/runtime/gc/space/rosalloc_space.cc index 9e900e4558..eca0e43a97 100644 --- a/runtime/gc/space/rosalloc_space.cc +++ b/runtime/gc/space/rosalloc_space.cc @@ -21,6 +21,7 @@ #include "gc/accounting/card_table.h" #include "gc/accounting/space_bitmap-inl.h" #include "gc/heap.h" +#include "memory_tool_malloc_space-inl.h" #include "mirror/class-inl.h" #include "mirror/object-inl.h" #include "runtime.h" @@ -28,7 +29,6 @@ #include "thread.h" #include "thread_list.h" #include "utils.h" -#include "memory_tool_malloc_space-inl.h" namespace art { namespace gc { diff --git a/runtime/gc/task_processor_test.cc b/runtime/gc/task_processor_test.cc index 5a75b37b67..77b40e4593 100644 --- a/runtime/gc/task_processor_test.cc +++ b/runtime/gc/task_processor_test.cc @@ -14,11 +14,11 @@ * limitations under the License. */ +#include "task_processor.h" #include "base/time_utils.h" #include "common_runtime_test.h" -#include "task_processor.h" -#include "thread_pool.h" #include "thread-current-inl.h" +#include "thread_pool.h" namespace art { namespace gc { diff --git a/runtime/hprof/hprof.cc b/runtime/hprof/hprof.cc index f428bc2751..7976a1a9a1 100644 --- a/runtime/hprof/hprof.cc +++ b/runtime/hprof/hprof.cc @@ -32,8 +32,8 @@ #include <sys/time.h> #include <sys/uio.h> #include <time.h> -#include <time.h> #include <unistd.h> + #include <set> #include "android-base/stringprintf.h" @@ -47,18 +47,18 @@ #include "common_throws.h" #include "debugger.h" #include "dex_file-inl.h" -#include "gc_root.h" #include "gc/accounting/heap_bitmap.h" #include "gc/allocation_record.h" -#include "gc/scoped_gc_critical_section.h" -#include "gc/heap.h" #include "gc/heap-visit-objects-inl.h" +#include "gc/heap.h" +#include "gc/scoped_gc_critical_section.h" #include "gc/space/space.h" +#include "gc_root.h" #include "globals.h" #include "jdwp/jdwp.h" #include "jdwp/jdwp_priv.h" -#include "mirror/class.h" #include "mirror/class-inl.h" +#include "mirror/class.h" #include "mirror/object-refvisitor-inl.h" #include "os.h" #include "safe_map.h" diff --git a/runtime/image.cc b/runtime/image.cc index 7d0a70909b..950ac5dcbf 100644 --- a/runtime/image.cc +++ b/runtime/image.cc @@ -18,9 +18,9 @@ #include "base/bit_utils.h" #include "base/length_prefixed_array.h" -#include "mirror/object_array.h" -#include "mirror/object_array-inl.h" #include "mirror/object-inl.h" +#include "mirror/object_array-inl.h" +#include "mirror/object_array.h" #include "utils.h" namespace art { diff --git a/runtime/imtable_test.cc b/runtime/imtable_test.cc index d482183d86..d662114912 100644 --- a/runtime/imtable_test.cc +++ b/runtime/imtable_test.cc @@ -24,10 +24,10 @@ #include "base/mutex.h" #include "class_linker.h" #include "common_runtime_test.h" +#include "handle_scope-inl.h" #include "mirror/accessible_object.h" #include "mirror/class.h" #include "mirror/class_loader.h" -#include "handle_scope-inl.h" #include "scoped_thread_state_change-inl.h" #include "thread-current-inl.h" diff --git a/runtime/indenter.h b/runtime/indenter.h index 78b18f63ab..cc6d4c4e96 100644 --- a/runtime/indenter.h +++ b/runtime/indenter.h @@ -17,11 +17,12 @@ #ifndef ART_RUNTIME_INDENTER_H_ #define ART_RUNTIME_INDENTER_H_ -#include "base/logging.h" -#include "base/macros.h" #include <ostream> #include <streambuf> +#include "base/logging.h" +#include "base/macros.h" + namespace art { constexpr char kIndentChar =' '; diff --git a/runtime/indenter_test.cc b/runtime/indenter_test.cc index 1a26d7b68e..09c0c54e5a 100644 --- a/runtime/indenter_test.cc +++ b/runtime/indenter_test.cc @@ -14,9 +14,10 @@ * limitations under the License. */ -#include "gtest/gtest.h" #include "indenter.h" +#include "gtest/gtest.h" + namespace art { TEST(IndenterTest, MultiLineTest) { diff --git a/runtime/instrumentation.cc b/runtime/instrumentation.cc index 8120cc484e..a8cf59b326 100644 --- a/runtime/instrumentation.cc +++ b/runtime/instrumentation.cc @@ -19,15 +19,15 @@ #include <sstream> #include "arch/context.h" -#include "art_method-inl.h" #include "art_field-inl.h" +#include "art_method-inl.h" #include "atomic.h" #include "base/callee_save_type.h" #include "class_linker.h" #include "debugger.h" #include "dex_file-inl.h" -#include "entrypoints/quick/quick_entrypoints.h" #include "entrypoints/quick/quick_alloc_entrypoints.h" +#include "entrypoints/quick/quick_entrypoints.h" #include "entrypoints/runtime_asm_entrypoints.h" #include "gc_root-inl.h" #include "interpreter/interpreter.h" @@ -36,8 +36,8 @@ #include "jvalue-inl.h" #include "mirror/class-inl.h" #include "mirror/dex_cache.h" -#include "mirror/object_array-inl.h" #include "mirror/object-inl.h" +#include "mirror/object_array-inl.h" #include "nth_caller_visitor.h" #include "oat_quick_method_header.h" #include "thread.h" diff --git a/runtime/instrumentation_test.cc b/runtime/instrumentation_test.cc index 9e9fa71e60..d25655f15a 100644 --- a/runtime/instrumentation_test.cc +++ b/runtime/instrumentation_test.cc @@ -18,9 +18,9 @@ #include "art_method-inl.h" #include "base/enums.h" +#include "class_linker-inl.h" #include "common_runtime_test.h" #include "common_throws.h" -#include "class_linker-inl.h" #include "dex_file.h" #include "gc/scoped_gc_critical_section.h" #include "handle_scope-inl.h" @@ -28,8 +28,8 @@ #include "jvalue.h" #include "runtime.h" #include "scoped_thread_state_change-inl.h" -#include "thread_list.h" #include "thread-inl.h" +#include "thread_list.h" #include "well_known_classes.h" namespace art { diff --git a/runtime/intern_table.cc b/runtime/intern_table.cc index 2bac2312bf..f4da5a44d9 100644 --- a/runtime/intern_table.cc +++ b/runtime/intern_table.cc @@ -18,14 +18,14 @@ #include <memory> -#include "gc_root-inl.h" #include "gc/collector/garbage_collector.h" #include "gc/space/image_space.h" #include "gc/weak_root_state.h" +#include "gc_root-inl.h" #include "image-inl.h" #include "mirror/dex_cache-inl.h" -#include "mirror/object_array-inl.h" #include "mirror/object-inl.h" +#include "mirror/object_array-inl.h" #include "mirror/string-inl.h" #include "object_callbacks.h" #include "scoped_thread_state_change-inl.h" diff --git a/runtime/intern_table.h b/runtime/intern_table.h index 2ec03be670..8714840d3f 100644 --- a/runtime/intern_table.h +++ b/runtime/intern_table.h @@ -23,8 +23,8 @@ #include "base/allocator.h" #include "base/hash_set.h" #include "base/mutex.h" -#include "gc_root.h" #include "gc/weak_root_state.h" +#include "gc_root.h" namespace art { diff --git a/runtime/intern_table_test.cc b/runtime/intern_table_test.cc index bb27b34cf5..9c3ea8d864 100644 --- a/runtime/intern_table_test.cc +++ b/runtime/intern_table_test.cc @@ -19,8 +19,8 @@ #include "base/hash_set.h" #include "common_runtime_test.h" #include "gc_root-inl.h" -#include "mirror/object.h" #include "handle_scope-inl.h" +#include "mirror/object.h" #include "mirror/string.h" #include "scoped_thread_state_change-inl.h" #include "utf.h" diff --git a/runtime/interpreter/interpreter_common.cc b/runtime/interpreter/interpreter_common.cc index be2d34d5b0..85904ee4ed 100644 --- a/runtime/interpreter/interpreter_common.cc +++ b/runtime/interpreter/interpreter_common.cc @@ -23,14 +23,14 @@ #include "entrypoints/runtime_asm_entrypoints.h" #include "jit/jit.h" #include "jvalue.h" -#include "method_handles.h" #include "method_handles-inl.h" +#include "method_handles.h" #include "mirror/array-inl.h" #include "mirror/class.h" #include "mirror/emulated_stack_frame.h" #include "mirror/method_handle_impl-inl.h" -#include "reflection.h" #include "reflection-inl.h" +#include "reflection.h" #include "stack.h" #include "thread-inl.h" #include "well_known_classes.h" diff --git a/runtime/interpreter/interpreter_common.h b/runtime/interpreter/interpreter_common.h index 74fec48342..d293aebc4c 100644 --- a/runtime/interpreter/interpreter_common.h +++ b/runtime/interpreter/interpreter_common.h @@ -22,9 +22,9 @@ #include <math.h> +#include <atomic> #include <iostream> #include <sstream> -#include <atomic> #include "android-base/stringprintf.h" diff --git a/runtime/interpreter/mterp/mterp.cc b/runtime/interpreter/mterp/mterp.cc index 5f94d04d13..5955b9001a 100644 --- a/runtime/interpreter/mterp/mterp.cc +++ b/runtime/interpreter/mterp/mterp.cc @@ -17,11 +17,11 @@ /* * Mterp entry point and support functions. */ -#include "interpreter/interpreter_common.h" -#include "interpreter/interpreter_intrinsics.h" -#include "entrypoints/entrypoint_utils-inl.h" #include "mterp.h" #include "debugger.h" +#include "entrypoints/entrypoint_utils-inl.h" +#include "interpreter/interpreter_common.h" +#include "interpreter/interpreter_intrinsics.h" namespace art { namespace interpreter { diff --git a/runtime/interpreter/mterp/mterp.h b/runtime/interpreter/mterp/mterp.h index 45ab98b9a6..1a56d26813 100644 --- a/runtime/interpreter/mterp/mterp.h +++ b/runtime/interpreter/mterp/mterp.h @@ -17,6 +17,9 @@ #ifndef ART_RUNTIME_INTERPRETER_MTERP_MTERP_H_ #define ART_RUNTIME_INTERPRETER_MTERP_MTERP_H_ +#include <cstddef> +#include <cstdint> + /* * Mterp assembly handler bases */ @@ -26,6 +29,9 @@ extern "C" void* artMterpAsmAltInstructionStart[]; extern "C" void* artMterpAsmAltInstructionEnd[]; namespace art { + +class Thread; + namespace interpreter { void InitMterpTls(Thread* self); diff --git a/runtime/interpreter/shadow_frame.h b/runtime/interpreter/shadow_frame.h index 69b2382cbc..05768cd6d3 100644 --- a/runtime/interpreter/shadow_frame.h +++ b/runtime/interpreter/shadow_frame.h @@ -17,8 +17,8 @@ #ifndef ART_RUNTIME_INTERPRETER_SHADOW_FRAME_H_ #define ART_RUNTIME_INTERPRETER_SHADOW_FRAME_H_ +#include <cstdint> #include <cstring> -#include <stdint.h> #include <string> #include "base/macros.h" diff --git a/runtime/interpreter/unstarted_runtime_test.cc b/runtime/interpreter/unstarted_runtime_test.cc index 87fa8beb01..71ab01e0fc 100644 --- a/runtime/interpreter/unstarted_runtime_test.cc +++ b/runtime/interpreter/unstarted_runtime_test.cc @@ -29,8 +29,8 @@ #include "handle_scope-inl.h" #include "interpreter/interpreter_common.h" #include "mirror/class_loader.h" -#include "mirror/object_array-inl.h" #include "mirror/object-inl.h" +#include "mirror/object_array-inl.h" #include "mirror/string-inl.h" #include "runtime.h" #include "scoped_thread_state_change-inl.h" diff --git a/runtime/jit/profile_compilation_info.cc b/runtime/jit/profile_compilation_info.cc index 0b7063d90f..c9bfc9c991 100644 --- a/runtime/jit/profile_compilation_info.cc +++ b/runtime/jit/profile_compilation_info.cc @@ -16,20 +16,20 @@ #include "profile_compilation_info.h" -#include "errno.h" -#include <limits.h> -#include <string> -#include <vector> -#include <stdlib.h> #include <sys/file.h> #include <sys/stat.h> -#include <sys/uio.h> -#include <sys/types.h> -#include <unistd.h> #include <sys/types.h> +#include <sys/uio.h> #include <unistd.h> #include <zlib.h> -#include <base/time_utils.h> + +#include <cerrno> +#include <climits> +#include <cstdlib> +#include <string> +#include <vector> + +#include "android-base/file.h" #include "base/arena_allocator.h" #include "base/dumpable.h" @@ -37,12 +37,12 @@ #include "base/scoped_flock.h" #include "base/stl_util.h" #include "base/systrace.h" +#include "base/time_utils.h" #include "base/unix_file/fd_file.h" #include "jit/profiling_info.h" #include "os.h" #include "safe_map.h" #include "utils.h" -#include "android-base/file.h" namespace art { diff --git a/runtime/jit/profile_compilation_info.h b/runtime/jit/profile_compilation_info.h index 4ab8be84c3..ffb67ae2be 100644 --- a/runtime/jit/profile_compilation_info.h +++ b/runtime/jit/profile_compilation_info.h @@ -21,8 +21,8 @@ #include <vector> #include "atomic.h" -#include "base/arena_object.h" #include "base/arena_containers.h" +#include "base/arena_object.h" #include "bit_memory_region.h" #include "dex_cache_resolved_classes.h" #include "dex_file.h" diff --git a/runtime/jit/profile_compilation_info_test.cc b/runtime/jit/profile_compilation_info_test.cc index 1ba98acab8..6010bce2e5 100644 --- a/runtime/jit/profile_compilation_info_test.cc +++ b/runtime/jit/profile_compilation_info_test.cc @@ -16,17 +16,17 @@ #include <gtest/gtest.h> -#include "base/unix_file/fd_file.h" #include "art_method-inl.h" +#include "base/unix_file/fd_file.h" #include "class_linker-inl.h" #include "common_runtime_test.h" #include "dex_file.h" -#include "method_reference.h" -#include "mirror/class-inl.h" -#include "mirror/class_loader.h" #include "handle_scope-inl.h" #include "jit/profile_compilation_info.h" #include "linear_alloc.h" +#include "method_reference.h" +#include "mirror/class-inl.h" +#include "mirror/class_loader.h" #include "scoped_thread_state_change-inl.h" #include "type_reference.h" diff --git a/runtime/jit/profile_saver.cc b/runtime/jit/profile_saver.cc index 61e5be34cb..381e95f8f8 100644 --- a/runtime/jit/profile_saver.cc +++ b/runtime/jit/profile_saver.cc @@ -16,10 +16,10 @@ #include "profile_saver.h" +#include <fcntl.h> #include <sys/resource.h> -#include <sys/types.h> #include <sys/stat.h> -#include <fcntl.h> +#include <sys/types.h> #include "android-base/strings.h" diff --git a/runtime/jit/profile_saver_options.h b/runtime/jit/profile_saver_options.h index 251227e89c..d1e14e2766 100644 --- a/runtime/jit/profile_saver_options.h +++ b/runtime/jit/profile_saver_options.h @@ -13,8 +13,8 @@ #ifndef ART_RUNTIME_JIT_PROFILE_SAVER_OPTIONS_H_ #define ART_RUNTIME_JIT_PROFILE_SAVER_OPTIONS_H_ -#include <string> #include <ostream> +#include <string> namespace art { diff --git a/runtime/leb128_test.cc b/runtime/leb128_test.cc index 122f55ebee..747fc19f5d 100644 --- a/runtime/leb128_test.cc +++ b/runtime/leb128_test.cc @@ -17,6 +17,7 @@ #include "leb128.h" #include "gtest/gtest.h" + #include "base/histogram-inl.h" #include "base/time_utils.h" diff --git a/runtime/lock_word.h b/runtime/lock_word.h index edc64f35a1..14f638ee78 100644 --- a/runtime/lock_word.h +++ b/runtime/lock_word.h @@ -17,8 +17,8 @@ #ifndef ART_RUNTIME_LOCK_WORD_H_ #define ART_RUNTIME_LOCK_WORD_H_ +#include <cstdint> #include <iosfwd> -#include <stdint.h> #include "base/bit_utils.h" #include "base/logging.h" diff --git a/runtime/managed_stack-inl.h b/runtime/managed_stack-inl.h index bdf8100cc0..689dd8009a 100644 --- a/runtime/managed_stack-inl.h +++ b/runtime/managed_stack-inl.h @@ -19,10 +19,6 @@ #include "managed_stack.h" -#include <cstring> -#include <stdint.h> -#include <string> - #include "interpreter/shadow_frame.h" namespace art { diff --git a/runtime/managed_stack.h b/runtime/managed_stack.h index 8337f968ac..4f1984d55a 100644 --- a/runtime/managed_stack.h +++ b/runtime/managed_stack.h @@ -17,8 +17,8 @@ #ifndef ART_RUNTIME_MANAGED_STACK_H_ #define ART_RUNTIME_MANAGED_STACK_H_ +#include <cstdint> #include <cstring> -#include <stdint.h> #include <string> #include "base/logging.h" diff --git a/runtime/mem_map.cc b/runtime/mem_map.cc index 17035dda8f..da3da0fa0d 100644 --- a/runtime/mem_map.cc +++ b/runtime/mem_map.cc @@ -38,7 +38,6 @@ #include "globals.h" #include "utils.h" - #ifndef MAP_ANONYMOUS #define MAP_ANONYMOUS MAP_ANON #endif diff --git a/runtime/mem_map_test.cc b/runtime/mem_map_test.cc index 8d6bb38838..99bf0045c4 100644 --- a/runtime/mem_map_test.cc +++ b/runtime/mem_map_test.cc @@ -20,9 +20,9 @@ #include <memory> -#include "common_runtime_test.h" #include "base/memory_tool.h" #include "base/unix_file/fd_file.h" +#include "common_runtime_test.h" namespace art { diff --git a/runtime/memory_region_test.cc b/runtime/memory_region_test.cc index 6634c60193..e3aead47fa 100644 --- a/runtime/memory_region_test.cc +++ b/runtime/memory_region_test.cc @@ -14,11 +14,12 @@ * limitations under the License. */ -#include "bit_memory_region.h" #include "memory_region.h" #include "gtest/gtest.h" +#include "bit_memory_region.h" + namespace art { TEST(MemoryRegion, LoadUnaligned) { diff --git a/runtime/method_handles.cc b/runtime/method_handles.cc index f0d3cae4b4..65f39e4468 100644 --- a/runtime/method_handles.cc +++ b/runtime/method_handles.cc @@ -19,13 +19,13 @@ #include "android-base/stringprintf.h" #include "common_dex_operations.h" -#include "jvalue.h" #include "jvalue-inl.h" +#include "jvalue.h" #include "mirror/emulated_stack_frame.h" #include "mirror/method_handle_impl-inl.h" #include "mirror/method_type.h" -#include "reflection.h" #include "reflection-inl.h" +#include "reflection.h" #include "well_known_classes.h" namespace art { diff --git a/runtime/mirror/array-inl.h b/runtime/mirror/array-inl.h index bfbd4df537..63142d5c25 100644 --- a/runtime/mirror/array-inl.h +++ b/runtime/mirror/array-inl.h @@ -26,8 +26,8 @@ #include "base/logging.h" #include "class.h" #include "gc/heap-inl.h" -#include "object-inl.h" #include "obj_ptr-inl.h" +#include "object-inl.h" #include "thread.h" namespace art { diff --git a/runtime/mirror/array.cc b/runtime/mirror/array.cc index f283ec3e9d..6218dd9c9c 100644 --- a/runtime/mirror/array.cc +++ b/runtime/mirror/array.cc @@ -16,15 +16,15 @@ #include "array-inl.h" -#include "class.h" #include "class-inl.h" +#include "class.h" #include "class_linker-inl.h" #include "common_throws.h" #include "dex_file-inl.h" #include "gc/accounting/card_table-inl.h" +#include "handle_scope-inl.h" #include "object-inl.h" #include "object_array-inl.h" -#include "handle_scope-inl.h" #include "thread.h" #include "utils.h" diff --git a/runtime/mirror/array.h b/runtime/mirror/array.h index 99565c6f5d..11128bb5a2 100644 --- a/runtime/mirror/array.h +++ b/runtime/mirror/array.h @@ -18,8 +18,8 @@ #define ART_RUNTIME_MIRROR_ARRAY_H_ #include "base/enums.h" -#include "gc_root.h" #include "gc/allocator_type.h" +#include "gc_root.h" #include "obj_ptr.h" #include "object.h" diff --git a/runtime/mirror/class-inl.h b/runtime/mirror/class-inl.h index 121c259abb..67aeeff2e8 100644 --- a/runtime/mirror/class-inl.h +++ b/runtime/mirror/class-inl.h @@ -30,8 +30,8 @@ #include "dex_file-inl.h" #include "gc/heap-inl.h" #include "iftable.h" -#include "object_array.h" #include "object-inl.h" +#include "object_array.h" #include "read_barrier-inl.h" #include "reference-inl.h" #include "runtime.h" diff --git a/runtime/mirror/class.cc b/runtime/mirror/class.cc index 6f70b19aef..6642869900 100644 --- a/runtime/mirror/class.cc +++ b/runtime/mirror/class.cc @@ -20,19 +20,19 @@ #include "art_field-inl.h" #include "art_method-inl.h" +#include "class-inl.h" #include "class_ext.h" #include "class_linker-inl.h" #include "class_loader.h" -#include "class-inl.h" #include "dex_cache.h" #include "dex_file-inl.h" #include "dex_file_annotations.h" #include "gc/accounting/card_table-inl.h" #include "handle_scope-inl.h" #include "method.h" -#include "object_array-inl.h" #include "object-inl.h" #include "object-refvisitor-inl.h" +#include "object_array-inl.h" #include "object_lock.h" #include "runtime.h" #include "thread.h" diff --git a/runtime/mirror/class.h b/runtime/mirror/class.h index c62689796d..250604b2ef 100644 --- a/runtime/mirror/class.h +++ b/runtime/mirror/class.h @@ -20,11 +20,11 @@ #include "base/bit_utils.h" #include "base/enums.h" #include "base/iteration_range.h" +#include "class_flags.h" #include "dex_file.h" #include "dex_file_types.h" -#include "class_flags.h" -#include "gc_root.h" #include "gc/allocator_type.h" +#include "gc_root.h" #include "imtable.h" #include "invoke_type.h" #include "modifiers.h" diff --git a/runtime/mirror/class_loader.h b/runtime/mirror/class_loader.h index 381d96b541..f25f18fce8 100644 --- a/runtime/mirror/class_loader.h +++ b/runtime/mirror/class_loader.h @@ -18,9 +18,9 @@ #define ART_RUNTIME_MIRROR_CLASS_LOADER_H_ #include "base/mutex.h" +#include "obj_ptr.h" #include "object.h" #include "object_reference.h" -#include "obj_ptr.h" namespace art { diff --git a/runtime/mirror/dex_cache-inl.h b/runtime/mirror/dex_cache-inl.h index fdb14f1f08..8b11c1290d 100644 --- a/runtime/mirror/dex_cache-inl.h +++ b/runtime/mirror/dex_cache-inl.h @@ -26,13 +26,13 @@ #include "base/logging.h" #include "class_linker.h" #include "dex_file.h" -#include "gc_root.h" #include "gc/heap-inl.h" -#include "mirror/class.h" +#include "gc_root.h" #include "mirror/call_site.h" +#include "mirror/class.h" #include "mirror/method_type.h" -#include "runtime.h" #include "obj_ptr.h" +#include "runtime.h" #include <atomic> diff --git a/runtime/mirror/dex_cache.cc b/runtime/mirror/dex_cache.cc index 1a9f9993ac..f6f20ba3ab 100644 --- a/runtime/mirror/dex_cache.cc +++ b/runtime/mirror/dex_cache.cc @@ -24,8 +24,8 @@ #include "globals.h" #include "linear_alloc.h" #include "oat_file.h" -#include "object.h" #include "object-inl.h" +#include "object.h" #include "object_array-inl.h" #include "runtime.h" #include "string.h" diff --git a/runtime/mirror/dex_cache_test.cc b/runtime/mirror/dex_cache_test.cc index d2b9240da2..a3d90355ac 100644 --- a/runtime/mirror/dex_cache_test.cc +++ b/runtime/mirror/dex_cache_test.cc @@ -21,10 +21,10 @@ #include "art_method-inl.h" #include "class_linker.h" #include "common_runtime_test.h" +#include "handle_scope-inl.h" #include "linear_alloc.h" #include "mirror/class_loader-inl.h" #include "mirror/dex_cache-inl.h" -#include "handle_scope-inl.h" #include "scoped_thread_state_change-inl.h" namespace art { diff --git a/runtime/mirror/emulated_stack_frame.cc b/runtime/mirror/emulated_stack_frame.cc index be0eac05c9..a6129ccc5f 100644 --- a/runtime/mirror/emulated_stack_frame.cc +++ b/runtime/mirror/emulated_stack_frame.cc @@ -19,8 +19,8 @@ #include "class-inl.h" #include "gc_root-inl.h" #include "jvalue-inl.h" -#include "method_handles.h" #include "method_handles-inl.h" +#include "method_handles.h" #include "reflection-inl.h" namespace art { diff --git a/runtime/mirror/executable.cc b/runtime/mirror/executable.cc index 17c16a2c0b..fac33192e4 100644 --- a/runtime/mirror/executable.cc +++ b/runtime/mirror/executable.cc @@ -14,9 +14,10 @@ * limitations under the License. */ -#include "art_method-inl.h" #include "executable.h" +#include "art_method-inl.h" + namespace art { namespace mirror { diff --git a/runtime/mirror/field.cc b/runtime/mirror/field.cc index 54034c2bbf..b4d93b6d4d 100644 --- a/runtime/mirror/field.cc +++ b/runtime/mirror/field.cc @@ -18,8 +18,8 @@ #include "class-inl.h" #include "dex_cache-inl.h" -#include "object_array-inl.h" #include "object-inl.h" +#include "object_array-inl.h" namespace art { namespace mirror { diff --git a/runtime/mirror/method.h b/runtime/mirror/method.h index 205ea7a050..61332e3bd9 100644 --- a/runtime/mirror/method.h +++ b/runtime/mirror/method.h @@ -17,8 +17,8 @@ #ifndef ART_RUNTIME_MIRROR_METHOD_H_ #define ART_RUNTIME_MIRROR_METHOD_H_ -#include "gc_root.h" #include "executable.h" +#include "gc_root.h" namespace art { namespace mirror { diff --git a/runtime/mirror/method_handle_impl.h b/runtime/mirror/method_handle_impl.h index c598fa3876..f362d43b01 100644 --- a/runtime/mirror/method_handle_impl.h +++ b/runtime/mirror/method_handle_impl.h @@ -21,8 +21,8 @@ #include "art_method.h" #include "class.h" #include "gc_root.h" -#include "object.h" #include "method_type.h" +#include "object.h" namespace art { diff --git a/runtime/mirror/method_handles_lookup.cc b/runtime/mirror/method_handles_lookup.cc index 9eada6dfdd..a390a2ef53 100644 --- a/runtime/mirror/method_handles_lookup.cc +++ b/runtime/mirror/method_handles_lookup.cc @@ -18,11 +18,11 @@ #include "class-inl.h" #include "gc_root-inl.h" -#include "object-inl.h" #include "handle_scope.h" #include "jni_internal.h" #include "mirror/method_handle_impl.h" #include "modifiers.h" +#include "object-inl.h" #include "well_known_classes.h" namespace art { diff --git a/runtime/mirror/method_handles_lookup.h b/runtime/mirror/method_handles_lookup.h index 2109f601ee..dd8d45e66f 100644 --- a/runtime/mirror/method_handles_lookup.h +++ b/runtime/mirror/method_handles_lookup.h @@ -17,10 +17,10 @@ #ifndef ART_RUNTIME_MIRROR_METHOD_HANDLES_LOOKUP_H_ #define ART_RUNTIME_MIRROR_METHOD_HANDLES_LOOKUP_H_ -#include "obj_ptr.h" #include "gc_root.h" -#include "object.h" #include "handle.h" +#include "obj_ptr.h" +#include "object.h" #include "utils.h" namespace art { diff --git a/runtime/mirror/method_type.h b/runtime/mirror/method_type.h index 374bbe5df3..a9f3c9c116 100644 --- a/runtime/mirror/method_type.h +++ b/runtime/mirror/method_type.h @@ -17,9 +17,9 @@ #ifndef ART_RUNTIME_MIRROR_METHOD_TYPE_H_ #define ART_RUNTIME_MIRROR_METHOD_TYPE_H_ +#include "object_array.h" #include "object.h" #include "string.h" -#include "mirror/object_array.h" #include "utils.h" namespace art { diff --git a/runtime/mirror/object-inl.h b/runtime/mirror/object-inl.h index 43d70b74ec..086925b9c7 100644 --- a/runtime/mirror/object-inl.h +++ b/runtime/mirror/object-inl.h @@ -19,20 +19,20 @@ #include "object.h" +#include "array-inl.h" #include "art_field.h" #include "art_method.h" #include "atomic.h" -#include "array-inl.h" #include "class-inl.h" #include "class_flags.h" #include "class_linker.h" #include "dex_cache.h" #include "lock_word-inl.h" #include "monitor.h" +#include "obj_ptr-inl.h" +#include "object-readbarrier-inl.h" #include "object_array-inl.h" #include "object_reference-inl.h" -#include "object-readbarrier-inl.h" -#include "obj_ptr-inl.h" #include "read_barrier-inl.h" #include "reference.h" #include "runtime.h" diff --git a/runtime/mirror/object-refvisitor-inl.h b/runtime/mirror/object-refvisitor-inl.h index f5ab4dd8db..39e32bf63c 100644 --- a/runtime/mirror/object-refvisitor-inl.h +++ b/runtime/mirror/object-refvisitor-inl.h @@ -19,8 +19,8 @@ #include "object-inl.h" -#include "class_loader-inl.h" #include "class-refvisitor-inl.h" +#include "class_loader-inl.h" #include "dex_cache-inl.h" namespace art { diff --git a/runtime/mirror/object.cc b/runtime/mirror/object.cc index 6e5fdb773f..78ef339b8c 100644 --- a/runtime/mirror/object.cc +++ b/runtime/mirror/object.cc @@ -18,22 +18,22 @@ #include "object.h" -#include "art_field.h" -#include "art_field-inl.h" #include "array-inl.h" -#include "class.h" +#include "art_field-inl.h" +#include "art_field.h" #include "class-inl.h" +#include "class.h" #include "class_linker-inl.h" #include "dex_file-inl.h" #include "gc/accounting/card_table-inl.h" #include "gc/heap.h" +#include "handle_scope-inl.h" #include "iftable-inl.h" #include "monitor.h" #include "object-inl.h" #include "object-refvisitor-inl.h" #include "object_array-inl.h" #include "runtime.h" -#include "handle_scope-inl.h" #include "throwable.h" #include "well_known_classes.h" diff --git a/runtime/mirror/object_array-inl.h b/runtime/mirror/object_array-inl.h index dbec40c6d0..5cfc987e44 100644 --- a/runtime/mirror/object_array-inl.h +++ b/runtime/mirror/object_array-inl.h @@ -26,10 +26,10 @@ #include "array-inl.h" #include "class.h" #include "gc/heap.h" -#include "object-inl.h" +#include "handle_scope-inl.h" #include "obj_ptr-inl.h" +#include "object-inl.h" #include "runtime.h" -#include "handle_scope-inl.h" #include "thread.h" #include "utils.h" diff --git a/runtime/mirror/object_test.cc b/runtime/mirror/object_test.cc index 6230ae96e1..1a0fc76190 100644 --- a/runtime/mirror/object_test.cc +++ b/runtime/mirror/object_test.cc @@ -26,8 +26,8 @@ #include "asm_support.h" #include "base/enums.h" #include "class-inl.h" -#include "class_linker.h" #include "class_linker-inl.h" +#include "class_linker.h" #include "common_runtime_test.h" #include "dex_file.h" #include "entrypoints/entrypoint_utils-inl.h" diff --git a/runtime/mirror/stack_trace_element.cc b/runtime/mirror/stack_trace_element.cc index 53de821498..bb3242e035 100644 --- a/runtime/mirror/stack_trace_element.cc +++ b/runtime/mirror/stack_trace_element.cc @@ -16,12 +16,12 @@ #include "stack_trace_element.h" -#include "class.h" #include "class-inl.h" +#include "class.h" #include "gc/accounting/card_table-inl.h" #include "gc_root-inl.h" -#include "object-inl.h" #include "handle_scope-inl.h" +#include "object-inl.h" #include "string.h" namespace art { diff --git a/runtime/mirror/string.h b/runtime/mirror/string.h index 7fbe8bd3a6..545fe93516 100644 --- a/runtime/mirror/string.h +++ b/runtime/mirror/string.h @@ -17,8 +17,8 @@ #ifndef ART_RUNTIME_MIRROR_STRING_H_ #define ART_RUNTIME_MIRROR_STRING_H_ -#include "gc_root.h" #include "gc/allocator_type.h" +#include "gc_root.h" #include "object.h" namespace art { diff --git a/runtime/mirror/throwable.cc b/runtime/mirror/throwable.cc index aee4b19eeb..077ad50dcc 100644 --- a/runtime/mirror/throwable.cc +++ b/runtime/mirror/throwable.cc @@ -24,8 +24,8 @@ #include "dex_file-inl.h" #include "gc/accounting/card_table-inl.h" #include "object-inl.h" -#include "object_array.h" #include "object_array-inl.h" +#include "object_array.h" #include "stack_trace_element.h" #include "string.h" #include "utils.h" diff --git a/runtime/monitor_pool.cc b/runtime/monitor_pool.cc index 48e9a6b47d..9d221cca83 100644 --- a/runtime/monitor_pool.cc +++ b/runtime/monitor_pool.cc @@ -18,8 +18,8 @@ #include "base/logging.h" #include "base/mutex-inl.h" -#include "thread-current-inl.h" #include "monitor.h" +#include "thread-current-inl.h" namespace art { diff --git a/runtime/monitor_test.cc b/runtime/monitor_test.cc index fb12841345..7d89652ddf 100644 --- a/runtime/monitor_test.cc +++ b/runtime/monitor_test.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "barrier.h" #include "monitor.h" #include <string> #include "atomic.h" +#include "barrier.h" #include "base/time_utils.h" #include "class_linker-inl.h" #include "common_runtime_test.h" diff --git a/runtime/native/dalvik_system_VMRuntime.cc b/runtime/native/dalvik_system_VMRuntime.cc index 020612bdfa..4db9feb518 100644 --- a/runtime/native/dalvik_system_VMRuntime.cc +++ b/runtime/native/dalvik_system_VMRuntime.cc @@ -17,8 +17,8 @@ #include "dalvik_system_VMRuntime.h" #ifdef ART_TARGET_ANDROID -#include <sys/time.h> #include <sys/resource.h> +#include <sys/time.h> extern "C" void android_set_application_target_sdk_version(uint32_t version); #endif #include <limits.h> @@ -31,8 +31,8 @@ extern "C" void android_set_application_target_sdk_version(uint32_t version); #include "android-base/stringprintf.h" -#include "art_method-inl.h" #include "arch/instruction_set.h" +#include "art_method-inl.h" #include "base/enums.h" #include "class_linker-inl.h" #include "common_throws.h" diff --git a/runtime/native/dalvik_system_VMStack.cc b/runtime/native/dalvik_system_VMStack.cc index 2aeef60d00..a88563da1f 100644 --- a/runtime/native/dalvik_system_VMStack.cc +++ b/runtime/native/dalvik_system_VMStack.cc @@ -21,11 +21,11 @@ #include "art_method-inl.h" #include "gc/task_processor.h" #include "jni_internal.h" -#include "nth_caller_visitor.h" #include "mirror/class-inl.h" #include "mirror/class_loader.h" #include "mirror/object-inl.h" #include "native_util.h" +#include "nth_caller_visitor.h" #include "scoped_fast_native_object_access-inl.h" #include "scoped_thread_state_change-inl.h" #include "thread_list.h" diff --git a/runtime/native/java_lang_System.cc b/runtime/native/java_lang_System.cc index 0e5d740cab..553cbeaabc 100644 --- a/runtime/native/java_lang_System.cc +++ b/runtime/native/java_lang_System.cc @@ -22,8 +22,8 @@ #include "gc/accounting/card_table-inl.h" #include "jni_internal.h" #include "mirror/array.h" -#include "mirror/class.h" #include "mirror/class-inl.h" +#include "mirror/class.h" #include "mirror/object-inl.h" #include "mirror/object_array-inl.h" #include "native_util.h" diff --git a/runtime/native/java_lang_reflect_Constructor.cc b/runtime/native/java_lang_reflect_Constructor.cc index 242e87afa9..abbb347be6 100644 --- a/runtime/native/java_lang_reflect_Constructor.cc +++ b/runtime/native/java_lang_reflect_Constructor.cc @@ -20,8 +20,8 @@ #include "art_method-inl.h" #include "base/enums.h" -#include "class_linker.h" #include "class_linker-inl.h" +#include "class_linker.h" #include "dex_file_annotations.h" #include "jni_internal.h" #include "mirror/class-inl.h" diff --git a/runtime/native/java_lang_reflect_Field.cc b/runtime/native/java_lang_reflect_Field.cc index f19004dab5..9f59a1f751 100644 --- a/runtime/native/java_lang_reflect_Field.cc +++ b/runtime/native/java_lang_reflect_Field.cc @@ -20,8 +20,8 @@ #include "nativehelper/jni_macros.h" #include "art_field-inl.h" -#include "class_linker.h" #include "class_linker-inl.h" +#include "class_linker.h" #include "common_throws.h" #include "dex_file-inl.h" #include "dex_file_annotations.h" diff --git a/runtime/native/java_lang_reflect_Method.cc b/runtime/native/java_lang_reflect_Method.cc index cbbb6a8ea3..18ff9c39bf 100644 --- a/runtime/native/java_lang_reflect_Method.cc +++ b/runtime/native/java_lang_reflect_Method.cc @@ -20,8 +20,8 @@ #include "art_method-inl.h" #include "base/enums.h" -#include "class_linker.h" #include "class_linker-inl.h" +#include "class_linker.h" #include "dex_file_annotations.h" #include "jni_internal.h" #include "mirror/class-inl.h" diff --git a/runtime/native/libcore_util_CharsetUtils.cc b/runtime/native/libcore_util_CharsetUtils.cc index c6985482b6..9743c9413d 100644 --- a/runtime/native/libcore_util_CharsetUtils.cc +++ b/runtime/native/libcore_util_CharsetUtils.cc @@ -27,7 +27,6 @@ #include "scoped_fast_native_object_access-inl.h" #include "unicode/utf16.h" - namespace art { /** diff --git a/runtime/native/sun_misc_Unsafe.cc b/runtime/native/sun_misc_Unsafe.cc index e78c9da5e5..761362fcb2 100644 --- a/runtime/native/sun_misc_Unsafe.cc +++ b/runtime/native/sun_misc_Unsafe.cc @@ -16,11 +16,12 @@ #include "sun_misc_Unsafe.h" -#include <atomic> -#include <stdlib.h> -#include <string.h> #include <unistd.h> +#include <cstdlib> +#include <cstring> +#include <atomic> + #include "nativehelper/jni_macros.h" #include "common_throws.h" diff --git a/runtime/oat_file.cc b/runtime/oat_file.cc index 1c1189d7de..4033f8cd3a 100644 --- a/runtime/oat_file.cc +++ b/runtime/oat_file.cc @@ -17,15 +17,15 @@ #include "oat_file.h" #include <dlfcn.h> -#include <string.h> -#include <type_traits> -#include <unistd.h> - -#include <cstdlib> #ifndef __APPLE__ #include <link.h> // for dl_iterate_phdr. #endif +#include <unistd.h> + +#include <cstdlib> +#include <cstring> #include <sstream> +#include <type_traits> // dlopen_ext support from bionic. #ifdef ART_TARGET_ANDROID @@ -44,10 +44,10 @@ #include "elf_file.h" #include "elf_utils.h" #include "gc_root.h" -#include "oat.h" #include "mem_map.h" #include "mirror/class.h" #include "mirror/object-inl.h" +#include "oat.h" #include "oat_file-inl.h" #include "oat_file_manager.h" #include "os.h" diff --git a/runtime/oat_file_assistant.cc b/runtime/oat_file_assistant.cc index 96423c3ac3..dae41c1b67 100644 --- a/runtime/oat_file_assistant.cc +++ b/runtime/oat_file_assistant.cc @@ -25,8 +25,8 @@ #include "base/logging.h" #include "base/stl_util.h" -#include "compiler_filter.h" #include "class_linker.h" +#include "compiler_filter.h" #include "exec_utils.h" #include "gc/heap.h" #include "gc/space/image_space.h" diff --git a/runtime/oat_file_assistant_test.cc b/runtime/oat_file_assistant_test.cc index 1ecdd0d77e..c59dafcb38 100644 --- a/runtime/oat_file_assistant_test.cc +++ b/runtime/oat_file_assistant_test.cc @@ -14,18 +14,21 @@ * limitations under the License. */ +#include "oat_file_assistant.h" + +#include <sys/param.h> + #include <string> #include <vector> -#include <sys/param.h> -#include "android-base/strings.h" #include <gtest/gtest.h> +#include "android-base/strings.h" + #include "art_field-inl.h" #include "class_linker-inl.h" #include "common_runtime_test.h" #include "dexopt_test.h" -#include "oat_file_assistant.h" #include "oat_file_manager.h" #include "os.h" #include "scoped_thread_state_change-inl.h" diff --git a/runtime/oat_quick_method_header.h b/runtime/oat_quick_method_header.h index 152b0ba21b..3625b9e7a7 100644 --- a/runtime/oat_quick_method_header.h +++ b/runtime/oat_quick_method_header.h @@ -19,8 +19,8 @@ #include "arch/instruction_set.h" #include "base/macros.h" -#include "quick/quick_method_frame_info.h" #include "method_info.h" +#include "quick/quick_method_frame_info.h" #include "stack_map.h" #include "utils.h" diff --git a/runtime/object_lock.cc b/runtime/object_lock.cc index f6db544276..744bc42858 100644 --- a/runtime/object_lock.cc +++ b/runtime/object_lock.cc @@ -16,8 +16,8 @@ #include "object_lock.h" -#include "mirror/object-inl.h" #include "mirror/class_ext.h" +#include "mirror/object-inl.h" #include "monitor.h" namespace art { diff --git a/runtime/openjdkjvm/OpenjdkJvm.cc b/runtime/openjdkjvm/OpenjdkJvm.cc index c1b2636f70..b212ea1c20 100644 --- a/runtime/openjdkjvm/OpenjdkJvm.cc +++ b/runtime/openjdkjvm/OpenjdkJvm.cc @@ -32,12 +32,12 @@ /* * Services that OpenJDK expects the VM to provide. */ -#include<stdio.h> #include <dlfcn.h> #include <limits.h> -#include <sys/time.h> -#include <sys/socket.h> +#include <stdio.h> #include <sys/ioctl.h> +#include <sys/socket.h> +#include <sys/time.h> #include <unistd.h> #include "../../libcore/ojluni/src/main/native/jvm.h" // TODO(narayan): fix it diff --git a/runtime/openjdkjvmti/fixed_up_dex_file.h b/runtime/openjdkjvmti/fixed_up_dex_file.h index db12f489e9..a96ee1219e 100644 --- a/runtime/openjdkjvmti/fixed_up_dex_file.h +++ b/runtime/openjdkjvmti/fixed_up_dex_file.h @@ -37,6 +37,7 @@ #include "jni.h" #include "jvmti.h" + #include "base/mutex.h" #include "dex_file.h" diff --git a/runtime/openjdkjvmti/ti_class_definition.cc b/runtime/openjdkjvmti/ti_class_definition.cc index 8e8ab196f6..c73ef0d31c 100644 --- a/runtime/openjdkjvmti/ti_class_definition.cc +++ b/runtime/openjdkjvmti/ti_class_definition.cc @@ -35,10 +35,10 @@ #include "class_linker-inl.h" #include "dex_file.h" #include "fixed_up_dex_file.h" -#include "handle_scope-inl.h" #include "handle.h" -#include "mirror/class_ext.h" +#include "handle_scope-inl.h" #include "mirror/class-inl.h" +#include "mirror/class_ext.h" #include "mirror/object-inl.h" #include "reflection.h" #include "thread.h" diff --git a/runtime/openjdkjvmti/ti_class_loader.h b/runtime/openjdkjvmti/ti_class_loader.h index 1ac49886cb..af66c5fd4d 100644 --- a/runtime/openjdkjvmti/ti_class_loader.h +++ b/runtime/openjdkjvmti/ti_class_loader.h @@ -57,8 +57,8 @@ #include "obj_ptr.h" #include "scoped_thread_state_change-inl.h" #include "stack.h" -#include "ti_class_definition.h" #include "thread_list.h" +#include "ti_class_definition.h" #include "transform.h" #include "utf.h" #include "utils/dex_cache_arrays_layout-inl.h" diff --git a/runtime/openjdkjvmti/ti_dump.cc b/runtime/openjdkjvmti/ti_dump.cc index 7a1e53f6e5..809a5e47bb 100644 --- a/runtime/openjdkjvmti/ti_dump.cc +++ b/runtime/openjdkjvmti/ti_dump.cc @@ -33,7 +33,6 @@ #include <limits> - #include "art_jvmti.h" #include "base/mutex.h" #include "events-inl.h" diff --git a/runtime/openjdkjvmti/ti_field.cc b/runtime/openjdkjvmti/ti_field.cc index 32c064e89c..c45b926695 100644 --- a/runtime/openjdkjvmti/ti_field.cc +++ b/runtime/openjdkjvmti/ti_field.cc @@ -31,8 +31,8 @@ #include "ti_field.h" -#include "art_jvmti.h" #include "art_field-inl.h" +#include "art_jvmti.h" #include "base/enums.h" #include "dex_file_annotations.h" #include "jni_internal.h" diff --git a/runtime/openjdkjvmti/ti_heap.cc b/runtime/openjdkjvmti/ti_heap.cc index 91fdaca427..3397210151 100644 --- a/runtime/openjdkjvmti/ti_heap.cc +++ b/runtime/openjdkjvmti/ti_heap.cc @@ -21,8 +21,8 @@ #include "base/macros.h" #include "base/mutex.h" #include "class_linker.h" -#include "gc/heap.h" #include "gc/heap-visit-objects-inl.h" +#include "gc/heap.h" #include "gc_root-inl.h" #include "java_frame_root_info.h" #include "jni_env_ext.h" @@ -31,8 +31,8 @@ #include "mirror/class.h" #include "mirror/object-inl.h" #include "mirror/object_array-inl.h" -#include "object_tagging.h" #include "obj_ptr-inl.h" +#include "object_tagging.h" #include "primitive.h" #include "runtime.h" #include "scoped_thread_state_change-inl.h" diff --git a/runtime/openjdkjvmti/ti_redefine.h b/runtime/openjdkjvmti/ti_redefine.h index 27d7c3d726..03b4bf2074 100644 --- a/runtime/openjdkjvmti/ti_redefine.h +++ b/runtime/openjdkjvmti/ti_redefine.h @@ -57,8 +57,8 @@ #include "obj_ptr.h" #include "scoped_thread_state_change-inl.h" #include "stack.h" -#include "ti_class_definition.h" #include "thread_list.h" +#include "ti_class_definition.h" #include "transform.h" #include "utf.h" #include "utils/dex_cache_arrays_layout-inl.h" diff --git a/runtime/openjdkjvmti/transform.h b/runtime/openjdkjvmti/transform.h index ba40e04b44..ed24068bb2 100644 --- a/runtime/openjdkjvmti/transform.h +++ b/runtime/openjdkjvmti/transform.h @@ -35,10 +35,10 @@ #include <string> #include <jni.h> +#include "jvmti.h" #include "art_jvmti.h" #include "ti_class_definition.h" -#include "jvmti.h" namespace openjdkjvmti { diff --git a/runtime/os_linux.cc b/runtime/os_linux.cc index 0add4965d1..a463f700d8 100644 --- a/runtime/os_linux.cc +++ b/runtime/os_linux.cc @@ -16,9 +16,10 @@ #include "os.h" -#include <sys/types.h> -#include <sys/stat.h> #include <fcntl.h> +#include <sys/stat.h> +#include <sys/types.h> + #include <cstddef> #include <memory> diff --git a/runtime/parsed_options.h b/runtime/parsed_options.h index 1f5beb9984..0f8555a829 100644 --- a/runtime/parsed_options.h +++ b/runtime/parsed_options.h @@ -22,11 +22,11 @@ #include <jni.h> -#include "globals.h" +#include "arch/instruction_set.h" #include "gc/collector_type.h" #include "gc/space/large_object_space.h" -#include "arch/instruction_set.h" -#include "jit/profile_saver_options.h" +#include "globals.h" +// #include "jit/profile_saver_options.h" #include "runtime_options.h" namespace art { diff --git a/runtime/read_barrier-inl.h b/runtime/read_barrier-inl.h index 2d06e54f78..b0935c0b56 100644 --- a/runtime/read_barrier-inl.h +++ b/runtime/read_barrier-inl.h @@ -22,8 +22,8 @@ #include "gc/accounting/read_barrier_table.h" #include "gc/collector/concurrent_copying-inl.h" #include "gc/heap.h" -#include "mirror/object_reference.h" #include "mirror/object-readbarrier-inl.h" +#include "mirror/object_reference.h" #include "mirror/reference.h" #include "runtime.h" #include "utils.h" diff --git a/runtime/read_barrier.h b/runtime/read_barrier.h index ca776854cb..d36acbcdc4 100644 --- a/runtime/read_barrier.h +++ b/runtime/read_barrier.h @@ -18,8 +18,8 @@ #define ART_RUNTIME_READ_BARRIER_H_ #include "base/logging.h" -#include "base/mutex.h" #include "base/macros.h" +#include "base/mutex.h" #include "gc_root.h" #include "jni.h" #include "mirror/object_reference.h" diff --git a/runtime/reference_table.cc b/runtime/reference_table.cc index d8b9dcc016..e6e588e9b0 100644 --- a/runtime/reference_table.cc +++ b/runtime/reference_table.cc @@ -20,10 +20,10 @@ #include "base/mutex.h" #include "indirect_reference_table.h" -#include "mirror/array.h" #include "mirror/array-inl.h" -#include "mirror/class.h" +#include "mirror/array.h" #include "mirror/class-inl.h" +#include "mirror/class.h" #include "mirror/object-inl.h" #include "mirror/string-inl.h" #include "runtime-inl.h" diff --git a/runtime/runtime.cc b/runtime/runtime.cc index 2366e10fae..27124190c7 100644 --- a/runtime/runtime.cc +++ b/runtime/runtime.cc @@ -23,9 +23,10 @@ #include <sys/prctl.h> #endif +#include <fcntl.h> #include <signal.h> #include <sys/syscall.h> -#include "base/memory_tool.h" + #if defined(__APPLE__) #include <crt_externs.h> // for _NSGetEnviron #endif @@ -33,9 +34,7 @@ #include <cstdio> #include <cstdlib> #include <limits> -#include <memory_representation.h> #include <vector> -#include <fcntl.h> #include "android-base/strings.h" @@ -60,6 +59,7 @@ #include "base/arena_allocator.h" #include "base/dumpable.h" #include "base/enums.h" +#include "base/memory_tool.h" #include "base/stl_util.h" #include "base/systrace.h" #include "base/unix_file/fd_file.h" @@ -88,6 +88,7 @@ #include "jit/profile_saver.h" #include "jni_internal.h" #include "linear_alloc.h" +#include "memory_representation.h" #include "mirror/array.h" #include "mirror/class-inl.h" #include "mirror/class_ext.h" diff --git a/runtime/runtime_callbacks_test.cc b/runtime/runtime_callbacks_test.cc index 0ea3180143..983278d97e 100644 --- a/runtime/runtime_callbacks_test.cc +++ b/runtime/runtime_callbacks_test.cc @@ -16,7 +16,6 @@ #include "runtime_callbacks.h" -#include "jni.h" #include <signal.h> #include <sys/types.h> #include <unistd.h> @@ -25,6 +24,8 @@ #include <memory> #include <string> +#include "jni.h" + #include "art_method-inl.h" #include "base/mutex.h" #include "class_linker.h" diff --git a/runtime/runtime_options.cc b/runtime/runtime_options.cc index aa147198fc..b072bb0c37 100644 --- a/runtime/runtime_options.cc +++ b/runtime/runtime_options.cc @@ -18,13 +18,13 @@ #include <memory> +#include "debugger.h" #include "gc/heap.h" #include "monitor.h" #include "runtime.h" #include "thread_list.h" #include "trace.h" #include "utils.h" -#include "debugger.h" namespace art { diff --git a/runtime/runtime_options.h b/runtime/runtime_options.h index c509992533..89a1dcb415 100644 --- a/runtime/runtime_options.h +++ b/runtime/runtime_options.h @@ -17,21 +17,20 @@ #ifndef ART_RUNTIME_RUNTIME_OPTIONS_H_ #define ART_RUNTIME_RUNTIME_OPTIONS_H_ -#include <vector> +#include <cstdarg> +#include <cstdio> #include <string> +#include <vector> -#include <stdio.h> -#include <stdarg.h> - +#include "arch/instruction_set.h" #include "base/logging.h" #include "base/variant_map.h" #include "cmdline_types.h" // TODO: don't need to include this file here +#include "gc/collector_type.h" +#include "gc/space/large_object_space.h" #include "jdwp/jdwp.h" #include "jit/jit.h" #include "jit/jit_code_cache.h" -#include "gc/collector_type.h" -#include "gc/space/large_object_space.h" -#include "arch/instruction_set.h" #include "jit/profile_saver_options.h" #include "verifier/verifier_enums.h" diff --git a/runtime/stack_map.h b/runtime/stack_map.h index 21780a1bc9..3931b6242f 100644 --- a/runtime/stack_map.h +++ b/runtime/stack_map.h @@ -20,13 +20,13 @@ #include <limits> #include "arch/code_offset.h" -#include "base/bit_vector.h" #include "base/bit_utils.h" +#include "base/bit_vector.h" #include "bit_memory_region.h" #include "dex_file.h" +#include "leb128.h" #include "memory_region.h" #include "method_info.h" -#include "leb128.h" namespace art { diff --git a/runtime/thread.h b/runtime/thread.h index e1102ed322..776096a7bb 100644 --- a/runtime/thread.h +++ b/runtime/thread.h @@ -17,12 +17,13 @@ #ifndef ART_RUNTIME_THREAD_H_ #define ART_RUNTIME_THREAD_H_ +#include <setjmp.h> + #include <bitset> #include <deque> #include <iosfwd> #include <list> #include <memory> -#include <setjmp.h> #include <string> #include "arch/context.h" diff --git a/runtime/thread_android.cc b/runtime/thread_android.cc index d5db9838ab..8ff6c529b0 100644 --- a/runtime/thread_android.cc +++ b/runtime/thread_android.cc @@ -16,10 +16,10 @@ #include "thread.h" -#include <sys/time.h> -#include <sys/resource.h> -#include <limits.h> #include <errno.h> +#include <limits.h> +#include <sys/resource.h> +#include <sys/time.h> #include <cutils/sched_policy.h> #include <utils/threads.h> diff --git a/runtime/thread_list.cc b/runtime/thread_list.cc index f1a7b65c7c..488e4a6517 100644 --- a/runtime/thread_list.cc +++ b/runtime/thread_list.cc @@ -16,16 +16,16 @@ #include "thread_list.h" -#include <backtrace/BacktraceMap.h> #include <dirent.h> -#include "nativehelper/ScopedLocalRef.h" -#include "nativehelper/ScopedUtfChars.h" #include <sys/types.h> #include <unistd.h> #include <sstream> #include "android-base/stringprintf.h" +#include "backtrace/BacktraceMap.h" +#include "nativehelper/ScopedLocalRef.h" +#include "nativehelper/ScopedUtfChars.h" #include "base/histogram-inl.h" #include "base/mutex-inl.h" diff --git a/runtime/thread_pool.cc b/runtime/thread_pool.cc index 8349f33028..fb77b84550 100644 --- a/runtime/thread_pool.cc +++ b/runtime/thread_pool.cc @@ -16,11 +16,11 @@ #include "thread_pool.h" -#include <pthread.h> - #include <sys/mman.h> -#include <sys/time.h> #include <sys/resource.h> +#include <sys/time.h> + +#include <pthread.h> #include "android-base/stringprintf.h" diff --git a/runtime/transaction.cc b/runtime/transaction.cc index 359030e6d6..9e62aa6b55 100644 --- a/runtime/transaction.cc +++ b/runtime/transaction.cc @@ -16,8 +16,8 @@ #include "transaction.h" -#include "base/stl_util.h" #include "base/logging.h" +#include "base/stl_util.h" #include "gc/accounting/card_table-inl.h" #include "gc_root-inl.h" #include "intern_table.h" diff --git a/runtime/type_lookup_table.cc b/runtime/type_lookup_table.cc index 16cd7227f1..4fab39cd73 100644 --- a/runtime/type_lookup_table.cc +++ b/runtime/type_lookup_table.cc @@ -16,14 +16,14 @@ #include "type_lookup_table.h" +#include <cstring> +#include <memory> + #include "base/bit_utils.h" #include "dex_file-inl.h" #include "utf-inl.h" #include "utils.h" -#include <memory> -#include <cstring> - namespace art { static uint16_t MakeData(uint16_t class_def_idx, uint32_t hash, uint32_t mask) { diff --git a/runtime/type_lookup_table_test.cc b/runtime/type_lookup_table_test.cc index ec38b4154e..ac11871d19 100644 --- a/runtime/type_lookup_table_test.cc +++ b/runtime/type_lookup_table_test.cc @@ -14,13 +14,13 @@ * limitations under the License. */ +#include "type_lookup_table.h" #include <memory> #include "common_runtime_test.h" #include "dex_file-inl.h" #include "scoped_thread_state_change-inl.h" -#include "type_lookup_table.h" #include "utf-inl.h" namespace art { diff --git a/runtime/utils.cc b/runtime/utils.cc index c4b044110c..ffa9d45812 100644 --- a/runtime/utils.cc +++ b/runtime/utils.cc @@ -23,6 +23,7 @@ #include <sys/types.h> #include <sys/wait.h> #include <unistd.h> + #include <memory> #include "android-base/stringprintf.h" @@ -38,9 +39,9 @@ #include "utf-inl.h" #if defined(__APPLE__) -#include "AvailabilityMacros.h" // For MAC_OS_X_VERSION_MAX_ALLOWED -#include <sys/syscall.h> #include <crt_externs.h> +#include <sys/syscall.h> +#include "AvailabilityMacros.h" // For MAC_OS_X_VERSION_MAX_ALLOWED #endif #if defined(__linux__) diff --git a/runtime/utils_test.cc b/runtime/utils_test.cc index 48b703a8ba..ee8eb363f1 100644 --- a/runtime/utils_test.cc +++ b/runtime/utils_test.cc @@ -22,13 +22,13 @@ #include "class_linker-inl.h" #include "common_runtime_test.h" #include "exec_utils.h" -#include "mirror/array.h" +#include "handle_scope-inl.h" #include "mirror/array-inl.h" +#include "mirror/array.h" #include "mirror/object-inl.h" #include "mirror/object_array-inl.h" #include "mirror/string.h" #include "scoped_thread_state_change-inl.h" -#include "handle_scope-inl.h" #include "base/memory_tool.h" diff --git a/runtime/verifier/method_verifier-inl.h b/runtime/verifier/method_verifier-inl.h index 363bd8f54f..6c832e3492 100644 --- a/runtime/verifier/method_verifier-inl.h +++ b/runtime/verifier/method_verifier-inl.h @@ -17,11 +17,12 @@ #ifndef ART_RUNTIME_VERIFIER_METHOD_VERIFIER_INL_H_ #define ART_RUNTIME_VERIFIER_METHOD_VERIFIER_INL_H_ -#include "base/logging.h" #include "method_verifier.h" + +#include "base/logging.h" +#include "handle_scope-inl.h" #include "mirror/class_loader.h" #include "mirror/dex_cache.h" -#include "handle_scope-inl.h" namespace art { namespace verifier { diff --git a/runtime/verifier/method_verifier.cc b/runtime/verifier/method_verifier.cc index 6dc7953ee1..6149f0d94e 100644 --- a/runtime/verifier/method_verifier.cc +++ b/runtime/verifier/method_verifier.cc @@ -39,8 +39,8 @@ #include "indenter.h" #include "intern_table.h" #include "leb128.h" -#include "mirror/class.h" #include "mirror/class-inl.h" +#include "mirror/class.h" #include "mirror/dex_cache-inl.h" #include "mirror/method_handle_impl.h" #include "mirror/object-inl.h" @@ -51,8 +51,8 @@ #include "scoped_thread_state_change-inl.h" #include "stack.h" #include "utils.h" -#include "verifier_deps.h" #include "verifier_compiler_binding.h" +#include "verifier_deps.h" namespace art { namespace verifier { diff --git a/runtime/verifier/method_verifier.h b/runtime/verifier/method_verifier.h index 46fdc5419d..ea8729cb3e 100644 --- a/runtime/verifier/method_verifier.h +++ b/runtime/verifier/method_verifier.h @@ -30,8 +30,8 @@ #include "handle.h" #include "instruction_flags.h" #include "method_reference.h" -#include "register_line.h" #include "reg_type_cache.h" +#include "register_line.h" #include "verifier_enums.h" namespace art { diff --git a/runtime/verifier/reg_type-inl.h b/runtime/verifier/reg_type-inl.h index 9245828ae2..704d2a86af 100644 --- a/runtime/verifier/reg_type-inl.h +++ b/runtime/verifier/reg_type-inl.h @@ -21,8 +21,8 @@ #include "base/casts.h" #include "base/scoped_arena_allocator.h" -#include "mirror/class.h" #include "method_verifier.h" +#include "mirror/class.h" #include "verifier_deps.h" namespace art { diff --git a/runtime/verifier/reg_type.cc b/runtime/verifier/reg_type.cc index 883de38e66..8df2e0f50b 100644 --- a/runtime/verifier/reg_type.cc +++ b/runtime/verifier/reg_type.cc @@ -24,8 +24,8 @@ #include "class_linker-inl.h" #include "dex_file-inl.h" #include "method_verifier.h" -#include "mirror/class.h" #include "mirror/class-inl.h" +#include "mirror/class.h" #include "mirror/object-inl.h" #include "mirror/object_array-inl.h" #include "reg_type_cache-inl.h" diff --git a/runtime/verifier/reg_type_cache.h b/runtime/verifier/reg_type_cache.h index c9bf6a90fe..7077c55a8d 100644 --- a/runtime/verifier/reg_type_cache.h +++ b/runtime/verifier/reg_type_cache.h @@ -48,6 +48,7 @@ class ImpreciseConstType; class IntegerType; class LongHiType; class LongLoType; +class MethodVerifier; class PreciseConstType; class PreciseReferenceType; class RegType; diff --git a/runtime/verifier/reg_type_test.cc b/runtime/verifier/reg_type_test.cc index 1aa0966f4f..1bc48ed71b 100644 --- a/runtime/verifier/reg_type_test.cc +++ b/runtime/verifier/reg_type_test.cc @@ -23,8 +23,8 @@ #include "base/scoped_arena_allocator.h" #include "common_runtime_test.h" #include "compiler_callbacks.h" -#include "reg_type_cache-inl.h" #include "reg_type-inl.h" +#include "reg_type_cache-inl.h" #include "scoped_thread_state_change-inl.h" #include "thread-current-inl.h" diff --git a/runtime/verifier/register_line.cc b/runtime/verifier/register_line.cc index 383d890702..34c406e5b0 100644 --- a/runtime/verifier/register_line.cc +++ b/runtime/verifier/register_line.cc @@ -20,8 +20,8 @@ #include "dex_instruction-inl.h" #include "method_verifier-inl.h" -#include "register_line-inl.h" #include "reg_type-inl.h" +#include "register_line-inl.h" namespace art { namespace verifier { |