[compiler-rt] ee92645 - [sanitizer] Change GetDTLSRange (#108345)
via llvm-commits
llvm-commits at lists.llvm.org
Thu Sep 12 10:27:57 PDT 2024
Author: Vitaly Buka
Date: 2024-09-12T10:27:54-07:00
New Revision: ee9264522caacad34c5dc2bfb239c223229b870d
URL: https://github.com/llvm/llvm-project/commit/ee9264522caacad34c5dc2bfb239c223229b870d
DIFF: https://github.com/llvm/llvm-project/commit/ee9264522caacad34c5dc2bfb239c223229b870d.diff
LOG: [sanitizer] Change GetDTLSRange (#108345)
We only need to change size, tls_beg should be unchanged.
Added:
Modified:
compiler-rt/lib/sanitizer_common/sanitizer_tls_get_addr.cpp
Removed:
################################################################################
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_tls_get_addr.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_tls_get_addr.cpp
index e5839f6f497474..17b9ff4aa6c40b 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_tls_get_addr.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_tls_get_addr.cpp
@@ -110,15 +110,15 @@ SANITIZER_WEAK_ATTRIBUTE
const void *__sanitizer_get_allocated_begin(const void *p);
}
-static bool GetDTLSRange(uptr &tls_beg, uptr &tls_size) {
+static uptr GetDTLSRange(uptr tls_beg) {
const void *start = __sanitizer_get_allocated_begin((void *)tls_beg);
if (!start)
- return false;
- tls_beg = (uptr)start;
- tls_size = __sanitizer_get_allocated_size(start);
+ return 0;
+ CHECK_EQ(start, (void *)tls_beg);
+ uptr tls_size = __sanitizer_get_allocated_size(start);
VReport(2, "__tls_get_addr: glibc DTLS suspected; tls={%p,0x%zx}\n",
(void *)tls_beg, tls_size);
- return true;
+ return tls_size;
}
DTLS::DTV *DTLS_on_tls_get_addr(void *arg_void, void *res,
@@ -142,10 +142,12 @@ DTLS::DTV *DTLS_on_tls_get_addr(void *arg_void, void *res,
// creation.
VReport(2, "__tls_get_addr: static tls: %p\n", (void *)tls_beg);
tls_size = 0;
- } else if (!GetDTLSRange(tls_beg, tls_size)) {
- VReport(2, "__tls_get_addr: Can't guess glibc version\n");
- // This may happen inside the DTOR of main thread, so just ignore it.
- tls_size = 0;
+ } else {
+ tls_size = GetDTLSRange(tls_beg);
+ if (tls_size) {
+ VReport(2, "__tls_get_addr: Can't guess glibc version\n");
+ // This may happen inside the DTOR of main thread, so just ignore it.
+ }
}
dtv->beg = tls_beg;
dtv->size = tls_size;
More information about the llvm-commits
mailing list