Skip to content

Commit 05dde07

Browse files
nikicyuxuanchen1997
authored andcommitted
[nsan] Swap alignas and visibility order (NFC) (#98933)
Summary: Use `alignas(16) SANITIZER_INTERFACE_ATTRIBUTE` instead of `SANITIZER_INTERFACE_ATTRIBUTE alignas(16)`, as the former is not supported prior to clang 16. See https://clang.godbolt.org/z/Wj1193xWK. This was broken by #96142 as part of other style changes. Test Plan: Reviewers: Subscribers: Tasks: Tags: Differential Revision: https://phabricator.intern.facebook.com/D60250864
1 parent e2da04d commit 05dde07

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

compiler-rt/lib/nsan/nsan.cpp

+10-11
Original file line numberDiff line numberDiff line change
@@ -390,24 +390,23 @@ __nsan_dump_shadow_mem(const u8 *addr, size_t size_bytes, size_t bytes_per_line,
390390
}
391391
}
392392

393-
SANITIZER_INTERFACE_ATTRIBUTE
394-
alignas(16) thread_local uptr __nsan_shadow_ret_tag = 0;
393+
alignas(16) SANITIZER_INTERFACE_ATTRIBUTE
394+
thread_local uptr __nsan_shadow_ret_tag = 0;
395395

396-
SANITIZER_INTERFACE_ATTRIBUTE
397-
alignas(16) thread_local char __nsan_shadow_ret_ptr[kMaxVectorWidth *
398-
sizeof(__float128)];
396+
alignas(16) SANITIZER_INTERFACE_ATTRIBUTE
397+
thread_local char __nsan_shadow_ret_ptr[kMaxVectorWidth *
398+
sizeof(__float128)];
399399

400-
SANITIZER_INTERFACE_ATTRIBUTE
401-
alignas(16) thread_local uptr __nsan_shadow_args_tag = 0;
400+
alignas(16) SANITIZER_INTERFACE_ATTRIBUTE
401+
thread_local uptr __nsan_shadow_args_tag = 0;
402402

403403
// Maximum number of args. This should be enough for anyone (tm). An alternate
404404
// scheme is to have the generated code create an alloca and make
405405
// __nsan_shadow_args_ptr point ot the alloca.
406406
constexpr const int kMaxNumArgs = 128;
407-
SANITIZER_INTERFACE_ATTRIBUTE
408-
alignas(
409-
16) thread_local char __nsan_shadow_args_ptr[kMaxVectorWidth * kMaxNumArgs *
410-
sizeof(__float128)];
407+
alignas(16) SANITIZER_INTERFACE_ATTRIBUTE
408+
thread_local char __nsan_shadow_args_ptr[kMaxVectorWidth * kMaxNumArgs *
409+
sizeof(__float128)];
411410

412411
enum ContinuationType { // Keep in sync with instrumentation pass.
413412
kContinueWithShadow = 0,

0 commit comments

Comments
 (0)