ART: Include cleanup
Let clang-format reorder the header includes.
Derived with:
* .clang-format:
BasedOnStyle: Google
IncludeIsMainRegex: '(_test|-inl)?$'
* Steps:
find . -name '*.cc' -o -name '*.h' | xargs sed -i.bak -e 's/^#include/ #include/' ; git commit -a -m 'ART: Include cleanup'
git-clang-format -style=file HEAD^
manual inspection
git commit -a --amend
Test: mmma art
Change-Id: Ia963a8ce3ce5f96b5e78acd587e26908c7a70d02
diff --git a/runtime/mirror/array-inl.h b/runtime/mirror/array-inl.h
index bfbd4df..63142d5 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 f283ec3..6218dd9 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 99565c6..11128bb 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 121c259..67aeeff 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 6f70b19..6642869 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 c626897..250604b 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 381d96b..f25f18f 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 fdb14f1..8b11c12 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 1a9f999..f6f20ba 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 d2b9240..a3d9035 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 be0eac0..a6129cc 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 17c16a2..fac3319 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 54034c2..b4d93b6 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 205ea7a..61332e3 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 c598fa3..f362d43 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 9eada6d..a390a2e 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 2109f60..dd8d45e 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 374bbe5..a9f3c9c 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 43d70b7..086925b 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 f5ab4dd..39e32bf 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 6e5fdb7..78ef339 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 dbec40c..5cfc987 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 "obj_ptr-inl.h"
-#include "runtime.h"
#include "handle_scope-inl.h"
+#include "obj_ptr-inl.h"
+#include "object-inl.h"
+#include "runtime.h"
#include "thread.h"
#include "utils.h"
diff --git a/runtime/mirror/object_test.cc b/runtime/mirror/object_test.cc
index 6230ae9..1a0fc76 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 53de821..bb3242e 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 7fbe8bd..545fe93 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 aee4b19..077ad50 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"