Skip to content

Commit 08771c4

Browse files
zacklj89vitalybuka
zacklj89
authored and
vitalybuka
committed
[ASan] Clang-format for #71833 
1 parent 5a6ffc5 commit 08771c4

File tree

3 files changed

+61
-56
lines changed

3 files changed

+61
-56
lines changed

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

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,15 @@ DECLARE_REAL_AND_INTERCEPTOR(void, free, void *)
9696
ASAN_WRITE_RANGE(ctx, ptr, size)
9797
#define COMMON_INTERCEPTOR_READ_RANGE(ctx, ptr, size) \
9898
ASAN_READ_RANGE(ctx, ptr, size)
99-
#define COMMON_INTERCEPTOR_ENTER(ctx, func, ...) \
100-
ASAN_INTERCEPTOR_ENTER(ctx, func); \
101-
do { \
102-
if (asan_init_is_running) \
103-
return REAL(func)(__VA_ARGS__); \
104-
if (SANITIZER_APPLE && UNLIKELY(!asan_inited)) \
105-
return REAL(func)(__VA_ARGS__); \
106-
ENSURE_ASAN_INITED(); \
107-
} while (false)
99+
# define COMMON_INTERCEPTOR_ENTER(ctx, func, ...) \
100+
ASAN_INTERCEPTOR_ENTER(ctx, func); \
101+
do { \
102+
if (asan_init_is_running) \
103+
return REAL(func)(__VA_ARGS__); \
104+
if (SANITIZER_APPLE && UNLIKELY(!asan_inited)) \
105+
return REAL(func)(__VA_ARGS__); \
106+
ENSURE_ASAN_INITED(); \
107+
} while (false)
108108
#define COMMON_INTERCEPTOR_DIR_ACQUIRE(ctx, path) \
109109
do { \
110110
} while (false)
@@ -556,7 +556,8 @@ INTERCEPTOR(char *, strcpy, char *to, const char *from) {
556556
INTERCEPTOR(char*, strdup, const char *s) {
557557
void *ctx;
558558
ASAN_INTERCEPTOR_ENTER(ctx, strdup);
559-
if (UNLIKELY(!asan_inited)) return internal_strdup(s);
559+
if (UNLIKELY(!asan_inited))
560+
return internal_strdup(s);
560561
ENSURE_ASAN_INITED();
561562
uptr length = internal_strlen(s);
562563
if (flags()->replace_str) {
@@ -574,7 +575,8 @@ INTERCEPTOR(char*, strdup, const char *s) {
574575
INTERCEPTOR(char*, __strdup, const char *s) {
575576
void *ctx;
576577
ASAN_INTERCEPTOR_ENTER(ctx, strdup);
577-
if (UNLIKELY(!asan_inited)) return internal_strdup(s);
578+
if (UNLIKELY(!asan_inited))
579+
return internal_strdup(s);
578580
ENSURE_ASAN_INITED();
579581
uptr length = internal_strlen(s);
580582
if (flags()->replace_str) {
@@ -634,8 +636,9 @@ INTERCEPTOR(int, atoi, const char *nptr) {
634636
void *ctx;
635637
ASAN_INTERCEPTOR_ENTER(ctx, atoi);
636638
#if SANITIZER_APPLE
637-
if (UNLIKELY(!asan_inited)) return REAL(atoi)(nptr);
638-
#endif
639+
if (UNLIKELY(!asan_inited))
640+
return REAL(atoi)(nptr);
641+
# endif
639642
ENSURE_ASAN_INITED();
640643
if (!flags()->replace_str) {
641644
return REAL(atoi)(nptr);
@@ -655,8 +658,9 @@ INTERCEPTOR(long, atol, const char *nptr) {
655658
void *ctx;
656659
ASAN_INTERCEPTOR_ENTER(ctx, atol);
657660
#if SANITIZER_APPLE
658-
if (UNLIKELY(!asan_inited)) return REAL(atol)(nptr);
659-
#endif
661+
if (UNLIKELY(!asan_inited))
662+
return REAL(atol)(nptr);
663+
# endif
660664
ENSURE_ASAN_INITED();
661665
if (!flags()->replace_str) {
662666
return REAL(atol)(nptr);
@@ -693,8 +697,9 @@ static void AtCxaAtexit(void *unused) {
693697
INTERCEPTOR(int, __cxa_atexit, void (*func)(void *), void *arg,
694698
void *dso_handle) {
695699
#if SANITIZER_APPLE
696-
if (UNLIKELY(!asan_inited)) return REAL(__cxa_atexit)(func, arg, dso_handle);
697-
#endif
700+
if (UNLIKELY(!asan_inited))
701+
return REAL(__cxa_atexit)(func, arg, dso_handle);
702+
# endif
698703
ENSURE_ASAN_INITED();
699704
#if CAN_SANITIZE_LEAKS
700705
__lsan::ScopedInterceptorDisabler disabler;

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

Lines changed: 37 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -23,45 +23,44 @@
2323
using namespace __asan;
2424
#define COMMON_MALLOC_ZONE_NAME "asan"
2525
#define COMMON_MALLOC_ENTER() ENSURE_ASAN_INITED()
26-
#define COMMON_MALLOC_SANITIZER_INITIALIZED asan_inited
27-
#define COMMON_MALLOC_FORCE_LOCK() asan_mz_force_lock()
28-
#define COMMON_MALLOC_FORCE_UNLOCK() asan_mz_force_unlock()
29-
#define COMMON_MALLOC_MEMALIGN(alignment, size) \
30-
GET_STACK_TRACE_MALLOC; \
31-
void *p = asan_memalign(alignment, size, &stack, FROM_MALLOC)
32-
#define COMMON_MALLOC_MALLOC(size) \
33-
GET_STACK_TRACE_MALLOC; \
34-
void *p = asan_malloc(size, &stack)
35-
#define COMMON_MALLOC_REALLOC(ptr, size) \
36-
GET_STACK_TRACE_MALLOC; \
37-
void *p = asan_realloc(ptr, size, &stack);
38-
#define COMMON_MALLOC_CALLOC(count, size) \
39-
GET_STACK_TRACE_MALLOC; \
40-
void *p = asan_calloc(count, size, &stack);
41-
#define COMMON_MALLOC_POSIX_MEMALIGN(memptr, alignment, size) \
42-
GET_STACK_TRACE_MALLOC; \
43-
int res = asan_posix_memalign(memptr, alignment, size, &stack);
44-
#define COMMON_MALLOC_VALLOC(size) \
45-
GET_STACK_TRACE_MALLOC; \
46-
void *p = asan_memalign(GetPageSizeCached(), size, &stack, FROM_MALLOC);
47-
#define COMMON_MALLOC_FREE(ptr) \
48-
GET_STACK_TRACE_FREE; \
49-
asan_free(ptr, &stack, FROM_MALLOC);
50-
#define COMMON_MALLOC_SIZE(ptr) \
51-
uptr size = asan_mz_size(ptr);
52-
#define COMMON_MALLOC_FILL_STATS(zone, stats) \
53-
AsanMallocStats malloc_stats; \
54-
FillMallocStatistics(&malloc_stats); \
55-
CHECK(sizeof(malloc_statistics_t) == sizeof(AsanMallocStats)); \
56-
internal_memcpy(stats, &malloc_stats, sizeof(malloc_statistics_t));
57-
#define COMMON_MALLOC_REPORT_UNKNOWN_REALLOC(ptr, zone_ptr, zone_name) \
58-
GET_STACK_TRACE_FREE; \
59-
ReportMacMzReallocUnknown((uptr)ptr, (uptr)zone_ptr, zone_name, &stack);
60-
#define COMMON_MALLOC_NAMESPACE __asan
61-
#define COMMON_MALLOC_HAS_ZONE_ENUMERATOR 0
62-
#define COMMON_MALLOC_HAS_EXTRA_INTROSPECTION_INIT 1
26+
# define COMMON_MALLOC_SANITIZER_INITIALIZED asan_inited
27+
# define COMMON_MALLOC_FORCE_LOCK() asan_mz_force_lock()
28+
# define COMMON_MALLOC_FORCE_UNLOCK() asan_mz_force_unlock()
29+
# define COMMON_MALLOC_MEMALIGN(alignment, size) \
30+
GET_STACK_TRACE_MALLOC; \
31+
void *p = asan_memalign(alignment, size, &stack, FROM_MALLOC)
32+
# define COMMON_MALLOC_MALLOC(size) \
33+
GET_STACK_TRACE_MALLOC; \
34+
void *p = asan_malloc(size, &stack)
35+
# define COMMON_MALLOC_REALLOC(ptr, size) \
36+
GET_STACK_TRACE_MALLOC; \
37+
void *p = asan_realloc(ptr, size, &stack);
38+
# define COMMON_MALLOC_CALLOC(count, size) \
39+
GET_STACK_TRACE_MALLOC; \
40+
void *p = asan_calloc(count, size, &stack);
41+
# define COMMON_MALLOC_POSIX_MEMALIGN(memptr, alignment, size) \
42+
GET_STACK_TRACE_MALLOC; \
43+
int res = asan_posix_memalign(memptr, alignment, size, &stack);
44+
# define COMMON_MALLOC_VALLOC(size) \
45+
GET_STACK_TRACE_MALLOC; \
46+
void *p = asan_memalign(GetPageSizeCached(), size, &stack, FROM_MALLOC);
47+
# define COMMON_MALLOC_FREE(ptr) \
48+
GET_STACK_TRACE_FREE; \
49+
asan_free(ptr, &stack, FROM_MALLOC);
50+
# define COMMON_MALLOC_SIZE(ptr) uptr size = asan_mz_size(ptr);
51+
# define COMMON_MALLOC_FILL_STATS(zone, stats) \
52+
AsanMallocStats malloc_stats; \
53+
FillMallocStatistics(&malloc_stats); \
54+
CHECK(sizeof(malloc_statistics_t) == sizeof(AsanMallocStats)); \
55+
internal_memcpy(stats, &malloc_stats, sizeof(malloc_statistics_t));
56+
# define COMMON_MALLOC_REPORT_UNKNOWN_REALLOC(ptr, zone_ptr, zone_name) \
57+
GET_STACK_TRACE_FREE; \
58+
ReportMacMzReallocUnknown((uptr)ptr, (uptr)zone_ptr, zone_name, &stack);
59+
# define COMMON_MALLOC_NAMESPACE __asan
60+
# define COMMON_MALLOC_HAS_ZONE_ENUMERATOR 0
61+
# define COMMON_MALLOC_HAS_EXTRA_INTROSPECTION_INIT 1
6362

64-
#include "sanitizer_common/sanitizer_malloc_mac.inc"
63+
# include "sanitizer_common/sanitizer_malloc_mac.inc"
6564

6665
namespace COMMON_MALLOC_NAMESPACE {
6766

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,8 @@ void PrintAddressSpaceLayout() {
382382
}
383383

384384
static void AsanInitInternal() {
385-
if (LIKELY(asan_inited)) return;
385+
if (LIKELY(asan_inited))
386+
return;
386387
SanitizerToolName = "AddressSanitizer";
387388
CHECK(!asan_init_is_running && "ASan init calls itself!");
388389
asan_init_is_running = true;

0 commit comments

Comments
 (0)