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/verifier/method_verifier-inl.h b/runtime/verifier/method_verifier-inl.h
index 363bd8f..6c832e3 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 6dc7953..6149f0d 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 46fdc54..ea8729c 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 9245828..704d2a8 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 883de38..8df2e0f 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 c9bf6a9..7077c55 100644
--- a/runtime/verifier/reg_type_cache.h
+++ b/runtime/verifier/reg_type_cache.h
@@ -48,6 +48,7 @@
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 1aa0966..1bc48ed 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 383d890..34c406e 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 {