Skip to content

Commit 1e07692

Browse files
vitalybukavitalybuka
committed
[NFC][sanitizer] Clang-format some includes
1 parent 3c91d01 commit 1e07692

13 files changed

+118
-119
lines changed

‎compiler-rt/lib/asan/asan_thread.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,18 @@
1010
//
1111
// Thread-related code.
1212
//===----------------------------------------------------------------------===//
13+
#include "asan_thread.h"
14+
1315
#include "asan_allocator.h"
1416
#include "asan_interceptors.h"
17+
#include "asan_mapping.h"
1518
#include "asan_poisoning.h"
1619
#include "asan_stack.h"
17-
#include "asan_thread.h"
18-
#include "asan_mapping.h"
20+
#include "lsan/lsan_common.h"
1921
#include "sanitizer_common/sanitizer_common.h"
2022
#include "sanitizer_common/sanitizer_placement_new.h"
2123
#include "sanitizer_common/sanitizer_stackdepot.h"
2224
#include "sanitizer_common/sanitizer_tls_get_addr.h"
23-
#include "lsan/lsan_common.h"
2425

2526
namespace __asan {
2627

‎compiler-rt/lib/sanitizer_common/sanitizer_allocator.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,10 @@ void *LowLevelAllocator::Allocate(uptr size) {
146146
size = RoundUpTo(size, low_level_alloc_min_alignment);
147147
if (allocated_end_ - allocated_current_ < (sptr)size) {
148148
uptr size_to_allocate = RoundUpTo(size, GetPageSizeCached());
149-
allocated_current_ =
150-
(char*)MmapOrDie(size_to_allocate, __func__);
149+
allocated_current_ = (char *)MmapOrDie(size_to_allocate, __func__);
151150
allocated_end_ = allocated_current_ + size_to_allocate;
152151
if (low_level_alloc_callback) {
153-
low_level_alloc_callback((uptr)allocated_current_,
154-
size_to_allocate);
152+
low_level_alloc_callback((uptr)allocated_current_, size_to_allocate);
155153
}
156154
}
157155
CHECK(allocated_end_ - allocated_current_ >= (sptr)size);

‎compiler-rt/lib/sanitizer_common/sanitizer_common.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ class LowLevelAllocator {
211211
public:
212212
// Requires an external lock.
213213
void *Allocate(uptr size);
214+
214215
private:
215216
char *allocated_end_;
216217
char *allocated_current_;

‎compiler-rt/lib/sanitizer_common/sanitizer_flag_parser.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
#include "sanitizer_flag_parser.h"
1414

1515
#include "sanitizer_common.h"
16-
#include "sanitizer_libc.h"
17-
#include "sanitizer_flags.h"
1816
#include "sanitizer_flag_parser.h"
17+
#include "sanitizer_flags.h"
18+
#include "sanitizer_libc.h"
1919

2020
namespace __sanitizer {
2121

‎compiler-rt/lib/sanitizer_common/sanitizer_flag_parser.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
#ifndef SANITIZER_FLAG_REGISTRY_H
1414
#define SANITIZER_FLAG_REGISTRY_H
1515

16+
#include "sanitizer_common.h"
1617
#include "sanitizer_internal_defs.h"
1718
#include "sanitizer_libc.h"
18-
#include "sanitizer_common.h"
1919

2020
namespace __sanitizer {
2121

‎compiler-rt/lib/sanitizer_common/sanitizer_mac.cpp

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -12,81 +12,81 @@
1212

1313
#include "sanitizer_platform.h"
1414
#if SANITIZER_APPLE
15-
#include "sanitizer_mac.h"
16-
#include "interception/interception.h"
15+
# include "interception/interception.h"
16+
# include "sanitizer_mac.h"
1717

1818
// Use 64-bit inodes in file operations. ASan does not support OS X 10.5, so
1919
// the clients will most certainly use 64-bit ones as well.
20-
#ifndef _DARWIN_USE_64_BIT_INODE
21-
#define _DARWIN_USE_64_BIT_INODE 1
22-
#endif
23-
#include <stdio.h>
24-
25-
#include "sanitizer_common.h"
26-
#include "sanitizer_file.h"
27-
#include "sanitizer_flags.h"
28-
#include "sanitizer_interface_internal.h"
29-
#include "sanitizer_internal_defs.h"
30-
#include "sanitizer_libc.h"
31-
#include "sanitizer_platform_limits_posix.h"
32-
#include "sanitizer_procmaps.h"
33-
#include "sanitizer_ptrauth.h"
34-
35-
#if !SANITIZER_IOS
36-
#include <crt_externs.h> // for _NSGetEnviron
37-
#else
20+
# ifndef _DARWIN_USE_64_BIT_INODE
21+
# define _DARWIN_USE_64_BIT_INODE 1
22+
# endif
23+
# include <stdio.h>
24+
25+
# include "sanitizer_common.h"
26+
# include "sanitizer_file.h"
27+
# include "sanitizer_flags.h"
28+
# include "sanitizer_interface_internal.h"
29+
# include "sanitizer_internal_defs.h"
30+
# include "sanitizer_libc.h"
31+
# include "sanitizer_platform_limits_posix.h"
32+
# include "sanitizer_procmaps.h"
33+
# include "sanitizer_ptrauth.h"
34+
35+
# if !SANITIZER_IOS
36+
# include <crt_externs.h> // for _NSGetEnviron
37+
# else
3838
extern char **environ;
39-
#endif
39+
# endif
4040

41-
#if defined(__has_include) && __has_include(<os/trace.h>)
42-
#define SANITIZER_OS_TRACE 1
43-
#include <os/trace.h>
44-
#else
45-
#define SANITIZER_OS_TRACE 0
46-
#endif
41+
# if defined(__has_include) && __has_include(<os/trace.h>)
42+
# define SANITIZER_OS_TRACE 1
43+
# include <os/trace.h>
44+
# else
45+
# define SANITIZER_OS_TRACE 0
46+
# endif
4747

4848
// import new crash reporting api
49-
#if defined(__has_include) && __has_include(<CrashReporterClient.h>)
50-
#define HAVE_CRASHREPORTERCLIENT_H 1
51-
#include <CrashReporterClient.h>
52-
#else
53-
#define HAVE_CRASHREPORTERCLIENT_H 0
54-
#endif
49+
# if defined(__has_include) && __has_include(<CrashReporterClient.h>)
50+
# define HAVE_CRASHREPORTERCLIENT_H 1
51+
# include <CrashReporterClient.h>
52+
# else
53+
# define HAVE_CRASHREPORTERCLIENT_H 0
54+
# endif
5555

56-
#if !SANITIZER_IOS
57-
#include <crt_externs.h> // for _NSGetArgv and _NSGetEnviron
58-
#else
56+
# if !SANITIZER_IOS
57+
# include <crt_externs.h> // for _NSGetArgv and _NSGetEnviron
58+
# else
5959
extern "C" {
60-
extern char ***_NSGetArgv(void);
60+
extern char ***_NSGetArgv(void);
6161
}
62-
#endif
62+
# endif
6363

64-
#include <asl.h>
65-
#include <dlfcn.h> // for dladdr()
66-
#include <errno.h>
67-
#include <fcntl.h>
68-
#include <libkern/OSAtomic.h>
69-
#include <mach-o/dyld.h>
70-
#include <mach/mach.h>
71-
#include <mach/mach_time.h>
72-
#include <mach/vm_statistics.h>
73-
#include <malloc/malloc.h>
74-
#include <os/log.h>
75-
#include <pthread.h>
76-
#include <pthread/introspection.h>
77-
#include <sched.h>
78-
#include <signal.h>
79-
#include <spawn.h>
80-
#include <stdlib.h>
81-
#include <sys/ioctl.h>
82-
#include <sys/mman.h>
83-
#include <sys/resource.h>
84-
#include <sys/stat.h>
85-
#include <sys/sysctl.h>
86-
#include <sys/types.h>
87-
#include <sys/wait.h>
88-
#include <unistd.h>
89-
#include <util.h>
64+
# include <asl.h>
65+
# include <dlfcn.h> // for dladdr()
66+
# include <errno.h>
67+
# include <fcntl.h>
68+
# include <libkern/OSAtomic.h>
69+
# include <mach-o/dyld.h>
70+
# include <mach/mach.h>
71+
# include <mach/mach_time.h>
72+
# include <mach/vm_statistics.h>
73+
# include <malloc/malloc.h>
74+
# include <os/log.h>
75+
# include <pthread.h>
76+
# include <pthread/introspection.h>
77+
# include <sched.h>
78+
# include <signal.h>
79+
# include <spawn.h>
80+
# include <stdlib.h>
81+
# include <sys/ioctl.h>
82+
# include <sys/mman.h>
83+
# include <sys/resource.h>
84+
# include <sys/stat.h>
85+
# include <sys/sysctl.h>
86+
# include <sys/types.h>
87+
# include <sys/wait.h>
88+
# include <unistd.h>
89+
# include <util.h>
9090

9191
// From <crt_externs.h>, but we don't have that file on iOS.
9292
extern "C" {

‎compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
#ifndef SANITIZER_SYMBOLIZER_INTERNAL_H
1414
#define SANITIZER_SYMBOLIZER_INTERNAL_H
1515

16-
#include "sanitizer_symbolizer.h"
1716
#include "sanitizer_file.h"
17+
#include "sanitizer_symbolizer.h"
1818
#include "sanitizer_vector.h"
1919

2020
namespace __sanitizer {

‎compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_libbacktrace.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
// Libbacktrace implementation of symbolizer parts.
1212
//===----------------------------------------------------------------------===//
1313

14-
#include "sanitizer_platform.h"
14+
#include "sanitizer_symbolizer_libbacktrace.h"
1515

1616
#include "sanitizer_internal_defs.h"
17+
#include "sanitizer_platform.h"
1718
#include "sanitizer_symbolizer.h"
18-
#include "sanitizer_symbolizer_libbacktrace.h"
1919

2020
#if SANITIZER_LIBBACKTRACE
2121
# include "backtrace-supported.h"

‎compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_mac.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
#include "sanitizer_platform.h"
1515
#if SANITIZER_APPLE
1616

17-
#include "sanitizer_allocator_internal.h"
18-
#include "sanitizer_mac.h"
19-
#include "sanitizer_symbolizer_mac.h"
20-
21-
#include <dlfcn.h>
22-
#include <errno.h>
23-
#include <stdlib.h>
24-
#include <sys/wait.h>
25-
#include <unistd.h>
26-
#include <util.h>
17+
# include <dlfcn.h>
18+
# include <errno.h>
19+
# include <stdlib.h>
20+
# include <sys/wait.h>
21+
# include <unistd.h>
22+
# include <util.h>
23+
24+
# include "sanitizer_allocator_internal.h"
25+
# include "sanitizer_mac.h"
26+
# include "sanitizer_symbolizer_mac.h"
2727

2828
namespace __sanitizer {
2929

‎compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,25 @@
1313

1414
#include "sanitizer_platform.h"
1515
#if SANITIZER_POSIX
16-
#include "sanitizer_allocator_internal.h"
17-
#include "sanitizer_common.h"
18-
#include "sanitizer_file.h"
19-
#include "sanitizer_flags.h"
20-
#include "sanitizer_internal_defs.h"
21-
#include "sanitizer_linux.h"
22-
#include "sanitizer_placement_new.h"
23-
#include "sanitizer_posix.h"
24-
#include "sanitizer_procmaps.h"
25-
#include "sanitizer_symbolizer_internal.h"
26-
#include "sanitizer_symbolizer_libbacktrace.h"
27-
#include "sanitizer_symbolizer_mac.h"
28-
29-
#include <dlfcn.h> // for dlsym()
30-
#include <errno.h>
31-
#include <stdint.h>
32-
#include <stdlib.h>
33-
#include <sys/wait.h>
34-
#include <unistd.h>
16+
# include <dlfcn.h> // for dlsym()
17+
# include <errno.h>
18+
# include <stdint.h>
19+
# include <stdlib.h>
20+
# include <sys/wait.h>
21+
# include <unistd.h>
22+
23+
# include "sanitizer_allocator_internal.h"
24+
# include "sanitizer_common.h"
25+
# include "sanitizer_file.h"
26+
# include "sanitizer_flags.h"
27+
# include "sanitizer_internal_defs.h"
28+
# include "sanitizer_linux.h"
29+
# include "sanitizer_placement_new.h"
30+
# include "sanitizer_posix.h"
31+
# include "sanitizer_procmaps.h"
32+
# include "sanitizer_symbolizer_internal.h"
33+
# include "sanitizer_symbolizer_libbacktrace.h"
34+
# include "sanitizer_symbolizer_mac.h"
3535

3636
// C++ demangling function, as required by Itanium C++ ABI. This is weak,
3737
// because we do not require a C++ ABI library to be linked to a program

‎compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_win.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
#include "sanitizer_platform.h"
1515
#if SANITIZER_WINDOWS
1616

17-
#include "sanitizer_dbghelp.h"
18-
#include "sanitizer_symbolizer_internal.h"
17+
# include "sanitizer_dbghelp.h"
18+
# include "sanitizer_symbolizer_internal.h"
1919

2020
namespace __sanitizer {
2121

‎compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@
1111
//
1212
//===----------------------------------------------------------------------===//
1313
#include "sanitizer_common/sanitizer_allocator.h"
14-
#include "sanitizer_common/sanitizer_allocator_internal.h"
15-
#include "sanitizer_common/sanitizer_common.h"
16-
17-
#include "sanitizer_test_utils.h"
18-
#include "sanitizer_pthread_wrappers.h"
19-
20-
#include "gtest/gtest.h"
2114

2215
#include <stdio.h>
2316
#include <stdlib.h>
17+
2418
#include <algorithm>
25-
#include <vector>
2619
#include <random>
2720
#include <set>
21+
#include <vector>
22+
23+
#include "gtest/gtest.h"
24+
#include "sanitizer_common/sanitizer_allocator_internal.h"
25+
#include "sanitizer_common/sanitizer_common.h"
26+
#include "sanitizer_pthread_wrappers.h"
27+
#include "sanitizer_test_utils.h"
2828

2929
using namespace __sanitizer;
3030

‎compiler-rt/lib/sanitizer_common/tests/sanitizer_thread_registry_test.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,10 @@
1111
//===----------------------------------------------------------------------===//
1212
#include "sanitizer_common/sanitizer_thread_registry.h"
1313

14-
#include "sanitizer_pthread_wrappers.h"
14+
#include <vector>
1515

1616
#include "gtest/gtest.h"
17-
18-
#include <vector>
17+
#include "sanitizer_pthread_wrappers.h"
1918

2019
namespace __sanitizer {
2120

0 commit comments

Comments
 (0)