Skip to content

[nsan] Swap alignas and visibility order (NFC) #98933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 17, 2024
Merged

[nsan] Swap alignas and visibility order (NFC) #98933

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f3f8e6
[nsan] Use ALIGNED instead of alignas (NFC)
nikic Jul 15, 2024
c73c419
Swap order instead
nikic Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions compiler-rt/lib/nsan/nsan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,24 +390,23 @@ __nsan_dump_shadow_mem(const u8 *addr, size_t size_bytes, size_t bytes_per_line,
}
}

SANITIZER_INTERFACE_ATTRIBUTE
alignas(16) thread_local uptr __nsan_shadow_ret_tag = 0;
alignas(16) SANITIZER_INTERFACE_ATTRIBUTE
thread_local uptr __nsan_shadow_ret_tag = 0;

SANITIZER_INTERFACE_ATTRIBUTE
alignas(16) thread_local char __nsan_shadow_ret_ptr[kMaxVectorWidth *
sizeof(__float128)];
alignas(16) SANITIZER_INTERFACE_ATTRIBUTE
thread_local char __nsan_shadow_ret_ptr[kMaxVectorWidth *
sizeof(__float128)];

SANITIZER_INTERFACE_ATTRIBUTE
alignas(16) thread_local uptr __nsan_shadow_args_tag = 0;
alignas(16) SANITIZER_INTERFACE_ATTRIBUTE
thread_local uptr __nsan_shadow_args_tag = 0;

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

enum ContinuationType { // Keep in sync with instrumentation pass.
kContinueWithShadow = 0,
Expand Down