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/test/004-JniTest/jni_test.cc b/test/004-JniTest/jni_test.cc
index f2edd0f..a34d633 100644
--- a/test/004-JniTest/jni_test.cc
+++ b/test/004-JniTest/jni_test.cc
@@ -14,9 +14,10 @@
* limitations under the License.
*/
-#include <iostream>
#include <pthread.h>
-#include <stdio.h>
+
+#include <cstdio>
+#include <iostream>
#include <vector>
#include "art_method-inl.h"
diff --git a/test/004-UnsafeTest/unsafe_test.cc b/test/004-UnsafeTest/unsafe_test.cc
index 4f6ae5a..18d9ea8 100644
--- a/test/004-UnsafeTest/unsafe_test.cc
+++ b/test/004-UnsafeTest/unsafe_test.cc
@@ -17,8 +17,8 @@
#include "art_method-inl.h"
#include "jni.h"
#include "mirror/array.h"
-#include "mirror/class.h"
#include "mirror/class-inl.h"
+#include "mirror/class.h"
#include "mirror/object-inl.h"
#include "scoped_thread_state_change-inl.h"
diff --git a/test/115-native-bridge/nativebridge.cc b/test/115-native-bridge/nativebridge.cc
index 307fd9b..a049b97 100644
--- a/test/115-native-bridge/nativebridge.cc
+++ b/test/115-native-bridge/nativebridge.cc
@@ -16,20 +16,21 @@
// A simple implementation of the native-bridge interface.
-#include <algorithm>
#include <dlfcn.h>
-#include <jni.h>
-#include <stdlib.h>
+#include <setjmp.h>
#include <signal.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include <algorithm>
+#include <cstdio>
+#include <cstdlib>
#include <vector>
-#include "stdio.h"
-#include "unistd.h"
-#include "sys/stat.h"
-#include "setjmp.h"
+#include <jni.h>
+#include <nativebridge/native_bridge.h>
#include "base/macros.h"
-#include "nativebridge/native_bridge.h"
struct NativeBridgeMethod {
const char* name;
diff --git a/test/137-cfi/cfi.cc b/test/137-cfi/cfi.cc
index 1ed1f5a..ad705c5 100644
--- a/test/137-cfi/cfi.cc
+++ b/test/137-cfi/cfi.cc
@@ -18,15 +18,15 @@
#include <errno.h>
#include <signal.h>
#include <string.h>
-#include <unistd.h>
#include <sys/ptrace.h>
#include <sys/wait.h>
+#include <unistd.h>
#endif
#include "jni.h"
-#include "android-base/stringprintf.h"
#include <backtrace/Backtrace.h>
+#include "android-base/stringprintf.h"
#include "base/logging.h"
#include "base/macros.h"
diff --git a/test/1901-get-bytecodes/bytecodes.cc b/test/1901-get-bytecodes/bytecodes.cc
index edcb734..2b3f8c8 100644
--- a/test/1901-get-bytecodes/bytecodes.cc
+++ b/test/1901-get-bytecodes/bytecodes.cc
@@ -14,18 +14,19 @@
* limitations under the License.
*/
-#include <iostream>
#include <pthread.h>
-#include <stdio.h>
+
+#include <cstdio>
+#include <iostream>
#include <vector>
#include "android-base/logging.h"
#include "jni.h"
+#include "jvmti.h"
+
#include "scoped_local_ref.h"
#include "scoped_primitive_array.h"
-#include "jvmti.h"
-
// Test infrastructure
#include "jvmti_helper.h"
#include "test_env.h"
diff --git a/test/596-app-images/app_images.cc b/test/596-app-images/app_images.cc
index fa9c902..498ea1d 100644
--- a/test/596-app-images/app_images.cc
+++ b/test/596-app-images/app_images.cc
@@ -14,16 +14,18 @@
* limitations under the License.
*/
-#include <iostream>
#include <pthread.h>
-#include <stdio.h>
+
+#include <cstdio>
+#include <iostream>
#include <vector>
+#include "jni.h"
+
#include "gc/heap.h"
#include "gc/space/image_space.h"
#include "gc/space/space-inl.h"
#include "image.h"
-#include "jni.h"
#include "mirror/class.h"
#include "runtime.h"
#include "scoped_thread_state_change-inl.h"
diff --git a/test/597-deopt-new-string/deopt.cc b/test/597-deopt-new-string/deopt.cc
index 0f02efe..fe229e4 100644
--- a/test/597-deopt-new-string/deopt.cc
+++ b/test/597-deopt-new-string/deopt.cc
@@ -15,13 +15,14 @@
*/
#include "jni.h"
-#include "mirror/class-inl.h"
-#include "runtime.h"
-#include "thread_list.h"
-#include "thread_state.h"
+
#include "gc/gc_cause.h"
#include "gc/scoped_gc_critical_section.h"
+#include "mirror/class-inl.h"
+#include "runtime.h"
#include "scoped_thread_state_change-inl.h"
+#include "thread_list.h"
+#include "thread_state.h"
namespace art {
diff --git a/test/903-hello-tagging/tagging.cc b/test/903-hello-tagging/tagging.cc
index a2694e7..e0a0136 100644
--- a/test/903-hello-tagging/tagging.cc
+++ b/test/903-hello-tagging/tagging.cc
@@ -14,18 +14,18 @@
* limitations under the License.
*/
-#include <iostream>
#include <pthread.h>
-#include <stdio.h>
+
+#include <cstdio>
+#include <iostream>
#include <vector>
#include "android-base/logging.h"
#include "jni.h"
+#include "jvmti.h"
#include "scoped_local_ref.h"
#include "scoped_primitive_array.h"
-#include "jvmti.h"
-
// Test infrastructure
#include "jvmti_helper.h"
#include "test_env.h"
diff --git a/test/904-object-allocation/tracking.cc b/test/904-object-allocation/tracking.cc
index 20b5328..9d2592a 100644
--- a/test/904-object-allocation/tracking.cc
+++ b/test/904-object-allocation/tracking.cc
@@ -14,10 +14,11 @@
* limitations under the License.
*/
+#include <pthread.h>
+
+#include <cstdio>
#include <iostream>
#include <mutex>
-#include <pthread.h>
-#include <stdio.h>
#include <vector>
#include "android-base/logging.h"
diff --git a/test/905-object-free/tracking_free.cc b/test/905-object-free/tracking_free.cc
index 5479772..bf86c9a 100644
--- a/test/905-object-free/tracking_free.cc
+++ b/test/905-object-free/tracking_free.cc
@@ -14,9 +14,10 @@
* limitations under the License.
*/
-#include <iostream>
#include <pthread.h>
-#include <stdio.h>
+
+#include <cstdio>
+#include <iostream>
#include <vector>
#include "android-base/logging.h"
diff --git a/test/906-iterate-heap/iterate_heap.cc b/test/906-iterate-heap/iterate_heap.cc
index 02ac699..57c0274 100644
--- a/test/906-iterate-heap/iterate_heap.cc
+++ b/test/906-iterate-heap/iterate_heap.cc
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-#include "inttypes.h"
+#include <inttypes.h>
+#include <pthread.h>
+#include <cstdio>
#include <iomanip>
#include <iostream>
-#include <pthread.h>
#include <sstream>
-#include <stdio.h>
#include <vector>
#include "android-base/logging.h"
diff --git a/test/907-get-loaded-classes/get_loaded_classes.cc b/test/907-get-loaded-classes/get_loaded_classes.cc
index 1eadf15..87c98e1 100644
--- a/test/907-get-loaded-classes/get_loaded_classes.cc
+++ b/test/907-get-loaded-classes/get_loaded_classes.cc
@@ -14,9 +14,10 @@
* limitations under the License.
*/
-#include <iostream>
#include <pthread.h>
-#include <stdio.h>
+
+#include <cstdio>
+#include <iostream>
#include <vector>
#include "android-base/macros.h"
diff --git a/test/911-get-stack-trace/stack_trace.cc b/test/911-get-stack-trace/stack_trace.cc
index 985120c..2b620b1 100644
--- a/test/911-get-stack-trace/stack_trace.cc
+++ b/test/911-get-stack-trace/stack_trace.cc
@@ -15,8 +15,9 @@
*/
#include <inttypes.h>
+
+#include <cstdio>
#include <memory>
-#include <stdio.h>
#include "android-base/logging.h"
#include "android-base/stringprintf.h"
diff --git a/test/913-heaps/heaps.cc b/test/913-heaps/heaps.cc
index bf3f7b6..f7862c7 100644
--- a/test/913-heaps/heaps.cc
+++ b/test/913-heaps/heaps.cc
@@ -15,15 +15,15 @@
*/
#include <inttypes.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
#include <iostream>
#include <sstream>
#include <vector>
-#include "android-base/macros.h"
#include "android-base/logging.h"
+#include "android-base/macros.h"
#include "android-base/stringprintf.h"
#include "jni.h"
diff --git a/test/933-misc-events/misc_events.cc b/test/933-misc-events/misc_events.cc
index 27dab8b..d2ae0f4 100644
--- a/test/933-misc-events/misc_events.cc
+++ b/test/933-misc-events/misc_events.cc
@@ -14,10 +14,11 @@
* limitations under the License.
*/
-#include <atomic>
#include <signal.h>
#include <sys/types.h>
+#include <atomic>
+
#include "android-base/logging.h"
#include "android-base/macros.h"
#include "jni.h"
diff --git a/test/945-obsolete-native/obsolete_native.cc b/test/945-obsolete-native/obsolete_native.cc
index e3090f5..418ce90 100644
--- a/test/945-obsolete-native/obsolete_native.cc
+++ b/test/945-obsolete-native/obsolete_native.cc
@@ -15,8 +15,9 @@
*/
#include <inttypes.h>
+
+#include <cstdio>
#include <memory>
-#include <stdio.h>
#include "android-base/stringprintf.h"
#include "jni.h"
@@ -24,8 +25,8 @@
// Test infrastructure
#include "jni_binder.h"
-#include "test_env.h"
#include "scoped_local_ref.h"
+#include "test_env.h"
namespace art {
namespace Test945ObsoleteNative {
diff --git a/test/983-source-transform-verify/source_transform.cc b/test/983-source-transform-verify/source_transform.cc
index 7cd39f4..570ade3 100644
--- a/test/983-source-transform-verify/source_transform.cc
+++ b/test/983-source-transform-verify/source_transform.cc
@@ -15,13 +15,15 @@
*/
#include <inttypes.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
#include <iostream>
#include <vector>
#include "android-base/stringprintf.h"
+#include "jni.h"
+#include "jvmti.h"
#include "base/logging.h"
#include "base/macros.h"
@@ -29,9 +31,7 @@
#include "dex_file.h"
#include "dex_instruction.h"
#include "jit/jit.h"
-#include "jni.h"
#include "native_stack_dump.h"
-#include "jvmti.h"
#include "runtime.h"
#include "scoped_thread_state_change-inl.h"
#include "thread-current-inl.h"
diff --git a/test/986-native-method-bind/native_bind.cc b/test/986-native-method-bind/native_bind.cc
index eec635b..1afe4db 100644
--- a/test/986-native-method-bind/native_bind.cc
+++ b/test/986-native-method-bind/native_bind.cc
@@ -14,10 +14,11 @@
* limitations under the License.
*/
-#include <inttypes.h>
-#include <memory>
-#include <stdio.h>
#include <dlfcn.h>
+#include <inttypes.h>
+
+#include <cstdio>
+#include <memory>
#include "android-base/stringprintf.h"
#include "jni.h"
@@ -26,8 +27,8 @@
// Test infrastructure
#include "jni_binder.h"
#include "jvmti_helper.h"
-#include "test_env.h"
#include "scoped_local_ref.h"
+#include "test_env.h"
namespace art {
namespace Test986NativeBind {
diff --git a/test/987-agent-bind/agent_bind.cc b/test/987-agent-bind/agent_bind.cc
index 44366c1..7dbdd8e 100644
--- a/test/987-agent-bind/agent_bind.cc
+++ b/test/987-agent-bind/agent_bind.cc
@@ -14,10 +14,11 @@
* limitations under the License.
*/
-#include <inttypes.h>
-#include <memory>
-#include <stdio.h>
#include <dlfcn.h>
+#include <inttypes.h>
+
+#include <cstdio>
+#include <memory>
#include "android-base/stringprintf.h"
#include "jni.h"
@@ -26,8 +27,8 @@
// Test infrastructure
#include "jni_binder.h"
#include "jvmti_helper.h"
-#include "test_env.h"
#include "scoped_local_ref.h"
+#include "test_env.h"
namespace art {
namespace Test987AgentBind {
diff --git a/test/989-method-trace-throw/method_trace.cc b/test/989-method-trace-throw/method_trace.cc
index 554784e..019b6a9 100644
--- a/test/989-method-trace-throw/method_trace.cc
+++ b/test/989-method-trace-throw/method_trace.cc
@@ -15,8 +15,9 @@
*/
#include <inttypes.h>
+
+#include <cstdio>
#include <memory>
-#include <stdio.h>
#include "android-base/logging.h"
#include "android-base/stringprintf.h"
diff --git a/test/992-source-data/source_file.cc b/test/992-source-data/source_file.cc
index 3e8989e..46d197d 100644
--- a/test/992-source-data/source_file.cc
+++ b/test/992-source-data/source_file.cc
@@ -15,8 +15,9 @@
*/
#include <inttypes.h>
+
+#include <cstdio>
#include <memory>
-#include <stdio.h>
#include "android-base/logging.h"
#include "android-base/stringprintf.h"
diff --git a/test/993-breakpoints/breakpoints.cc b/test/993-breakpoints/breakpoints.cc
index 1292070..3734ce8 100644
--- a/test/993-breakpoints/breakpoints.cc
+++ b/test/993-breakpoints/breakpoints.cc
@@ -15,8 +15,9 @@
*/
#include <inttypes.h>
+
+#include <cstdio>
#include <memory>
-#include <stdio.h>
#include "android-base/logging.h"
#include "android-base/stringprintf.h"
diff --git a/test/996-breakpoint-obsolete/obsolete_breakpoints.cc b/test/996-breakpoint-obsolete/obsolete_breakpoints.cc
index b6a67e4..820af47 100644
--- a/test/996-breakpoint-obsolete/obsolete_breakpoints.cc
+++ b/test/996-breakpoint-obsolete/obsolete_breakpoints.cc
@@ -15,8 +15,9 @@
*/
#include <inttypes.h>
+
+#include <cstdio>
#include <memory>
-#include <stdio.h>
#include "android-base/logging.h"
#include "android-base/stringprintf.h"
diff --git a/test/ti-agent/jvmti_helper.cc b/test/ti-agent/jvmti_helper.cc
index ccd3cab..51d3406 100644
--- a/test/ti-agent/jvmti_helper.cc
+++ b/test/ti-agent/jvmti_helper.cc
@@ -16,11 +16,12 @@
#include "jvmti_helper.h"
-#include <algorithm>
#include <dlfcn.h>
-#include <stdio.h>
+
+#include <algorithm>
+#include <cstdio>
+#include <cstring>
#include <sstream>
-#include <string.h>
#include "android-base/logging.h"
#include "scoped_local_ref.h"
diff --git a/test/ti-agent/jvmti_helper.h b/test/ti-agent/jvmti_helper.h
index 0145f36..78d238a 100644
--- a/test/ti-agent/jvmti_helper.h
+++ b/test/ti-agent/jvmti_helper.h
@@ -17,11 +17,12 @@
#ifndef ART_TEST_TI_AGENT_JVMTI_HELPER_H_
#define ART_TEST_TI_AGENT_JVMTI_HELPER_H_
-#include "jni.h"
-#include "jvmti.h"
#include <memory>
#include <ostream>
+#include "jni.h"
+#include "jvmti.h"
+
#include "android-base/logging.h"
namespace art {
diff --git a/test/ti-agent/redefinition_helper.cc b/test/ti-agent/redefinition_helper.cc
index 75a6f5f..76371de 100644
--- a/test/ti-agent/redefinition_helper.cc
+++ b/test/ti-agent/redefinition_helper.cc
@@ -16,9 +16,9 @@
#include "common_helper.h"
+#include <cstdio>
#include <deque>
#include <map>
-#include <stdio.h>
#include <sstream>
#include <string>
#include <vector>
diff --git a/test/ti-stress/stress.cc b/test/ti-stress/stress.cc
index aa50648..06d5af0 100644
--- a/test/ti-stress/stress.cc
+++ b/test/ti-stress/stress.cc
@@ -14,18 +14,18 @@
* limitations under the License.
*/
-#include <jni.h>
-#include <stdio.h>
-#include <iostream>
-#include <iomanip>
+#include <cstdio>
#include <fstream>
+#include <iomanip>
+#include <iostream>
#include <memory>
-#include <stdio.h>
#include <sstream>
#include <strstream>
-#include "jvmti.h"
+#include <jni.h>
+
#include "exec_utils.h"
+#include "jvmti.h"
#include "utils.h"
namespace art {