maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

tsan: add back __tls_get_addr interceptor 

Removal of the interceptor broke libtsan interface in gcc:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68824
Add back a simple interceptor.

llvm-svn: 258119
This commit is contained in:
Dmitry Vyukov 2016-01-19 12:28:00 +00:00
parent ffb673515e
commit f8f2d46002
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
compiler-rt/lib/tsan/rtl/tsan_interceptors.cc
View File

@ -2315,6 +2315,11 @@ static void HandleRecvmsg(ThreadState *thr, uptr pc,
// Since the interceptor only initializes memory for msan, the simplest solution
// is to disable the interceptor in tsan (other sanitizers do not call
// signal handlers from COMMON_INTERCEPTOR_ENTER).
// As __tls_get_addr has been intercepted in the past, to avoid breaking
// libtsan ABI, keep it around, but just call the real function.
#if SANITIZER_INTERCEPT_TLS_GET_ADDR
#define NEED_TLS_GET_ADDR
#endif
#undef SANITIZER_INTERCEPT_TLS_GET_ADDR
#define COMMON_INTERCEPT_FUNCTION(name) INTERCEPT_FUNCTION(name)
@ -2540,6 +2545,12 @@ static void syscall_post_fork(uptr pc, int pid) {
#include "sanitizer_common/sanitizer_common_syscalls.inc"
#ifdef NEED_TLS_GET_ADDR
TSAN_INTERCEPTOR(void *, __tls_get_addr, void *arg) {
return REAL(__tls_get_addr)(arg);
}
#endif
namespace __tsan {
static void finalize(void *arg) {
@ -2723,6 +2734,10 @@ void InitializeInterceptors() {
TSAN_INTERCEPT(__cxa_atexit);
TSAN_INTERCEPT(_exit);
#ifdef NEED_TLS_GET_ADDR
TSAN_INTERCEPT(__tls_get_addr);
#endif
#if !SANITIZER_MAC && !SANITIZER_ANDROID
// Need to setup it, because interceptors check that the function is resolved.
// But atexit is emitted directly into the module, so can't be resolved.