[tsan] Export __cxa_guard_ interceptors from TSan runtime. #171921
Merged
+3
−0
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
These functions from C++ ABI are defined in compiler-rt/lib/tsan/rtl/tsan_interceptors_posix.cpp and are supposed to replace implementations from libstdc++/libc++abi. We need to export them similar to why we need to export other interceptors and TSan runtime functions - e.g. if a dlopen-ed shared library depends on __cxa_guard_acquire, it needs to pick up the exported definition from the TSan runtime that was linked into the main executable calling the dlopen() However, because the __cxa_guard_ functions don't use traditional interceptor machinery, they are omitted from the auto-generated libclang_rt.tsan.a.syms files. Fix this by adding them to tsan.syms.extra file explicitly.
llvmbot
added
compiler-rt
compiler-rt:tsan
Member
|
@llvm/pr-subscribers-compiler-rt-sanitizer Author: Alexey Samsonov (vonosmas) ChangesThese functions from C++ ABI are defined in We need to export them similar to why we need to export other interceptors and TSan runtime functions - e.g. if a dlopen-ed shared library depends on However, because the Full diff: https://github.com/llvm/llvm-project/pull/171921.diff 1 Files Affected:
diff --git a/compiler-rt/lib/tsan/rtl/tsan.syms.extra b/compiler-rt/lib/tsan/rtl/tsan.syms.extra
index 6416e5d47fc41..03d17d21e74e8 100644
--- a/compiler-rt/lib/tsan/rtl/tsan.syms.extra
+++ b/compiler-rt/lib/tsan/rtl/tsan.syms.extra
@@ -1,3 +1,6 @@
+__cxa_guard_acquire
+__cxa_guard_abort
+__cxa_guard_release
__tsan_init
__tsan_flush_memory
__tsan_read*
|
🐧 Linux x64 Test Results
✅ The build succeeded and all tests passed. |
vitalybuka
approved these changes
Dec 13, 2025
Collaborator
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/169/builds/18020 Here is the relevant piece of the build log for the reference |
anonymouspc
pushed a commit
to anonymouspc/llvm
that referenced
this pull request
Dec 15, 2025
These functions from C++ ABI are defined in compiler-rt/lib/tsan/rtl/tsan_interceptors_posix.cpp and are supposed to replace implementations from libstdc++/libc++abi. We need to export them similar to why we need to export other interceptors and TSan runtime functions - e.g. if a dlopen-ed shared library depends on `__cxa_guard_acquire`, it needs to pick up the exported definition from the TSan runtime that was linked into the main executable calling the dlopen() However, because the `__cxa_guard_` functions don't use traditional interceptor machinery, they are omitted from the auto-generated `libclang_rt.tsan.a.syms` files. Fix this by adding them to tsan.syms.extra file explicitly. Co-authored-by: Vitaly Buka <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
These functions from C++ ABI are defined in
compiler-rt/lib/tsan/rtl/tsan_interceptors_posix.cpp and are supposed to replace implementations from libstdc++/libc++abi.
We need to export them similar to why we need to export other interceptors and TSan runtime functions - e.g. if a dlopen-ed shared library depends on
__cxa_guard_acquire, it needs to pick up the exported definition from the TSan runtime that was linked into the main executable calling the dlopen()However, because the
__cxa_guard_functions don't use traditional interceptor machinery, they are omitted from the auto-generatedlibclang_rt.tsan.a.symsfiles. Fix this by adding them to tsan.syms.extra file explicitly.