Skip to content

Commit b83289b

Browse files
authored
[NFC][asan] Replace a few #if SANITIZER_APPLE with if (SANITIZER_APPLE (llvm#74173)
1 parent 7e3aeee commit b83289b

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

compiler-rt/lib/asan/asan_interceptors.cpp

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -635,10 +635,8 @@ INTERCEPTOR_STRTO_BASE(long long, __isoc23_strtoll)
635635
INTERCEPTOR(int, atoi, const char *nptr) {
636636
void *ctx;
637637
ASAN_INTERCEPTOR_ENTER(ctx, atoi);
638-
#if SANITIZER_APPLE
639-
if (UNLIKELY(!AsanInited()))
638+
if (SANITIZER_APPLE && UNLIKELY(!AsanInited()))
640639
return REAL(atoi)(nptr);
641-
# endif
642640
ENSURE_ASAN_INITED();
643641
if (!flags()->replace_str) {
644642
return REAL(atoi)(nptr);
@@ -657,10 +655,8 @@ INTERCEPTOR(int, atoi, const char *nptr) {
657655
INTERCEPTOR(long, atol, const char *nptr) {
658656
void *ctx;
659657
ASAN_INTERCEPTOR_ENTER(ctx, atol);
660-
#if SANITIZER_APPLE
661-
if (UNLIKELY(!AsanInited()))
658+
if (SANITIZER_APPLE && UNLIKELY(!AsanInited()))
662659
return REAL(atol)(nptr);
663-
# endif
664660
ENSURE_ASAN_INITED();
665661
if (!flags()->replace_str) {
666662
return REAL(atol)(nptr);
@@ -696,10 +692,8 @@ static void AtCxaAtexit(void *unused) {
696692
#if ASAN_INTERCEPT___CXA_ATEXIT
697693
INTERCEPTOR(int, __cxa_atexit, void (*func)(void *), void *arg,
698694
void *dso_handle) {
699-
#if SANITIZER_APPLE
700-
if (UNLIKELY(!AsanInited()))
695+
if (SANITIZER_APPLE && UNLIKELY(!AsanInited()))
701696
return REAL(__cxa_atexit)(func, arg, dso_handle);
702-
# endif
703697
ENSURE_ASAN_INITED();
704698
#if CAN_SANITIZE_LEAKS
705699
__lsan::ScopedInterceptorDisabler disabler;

0 commit comments

Comments
 (0)