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

[tsan] Skip malloc/free interceptors when we're inside symbolizer on OS X 

Symbolizers can call malloc/realloc/free/..., which we don't want to intercept. This is already implemented on Linux, let's do it for OS X as well.

Differential Revision: http://reviews.llvm.org/D14710

llvm-svn: 253460
This commit is contained in:
Kuba Brecka 2015-11-18 14:50:40 +00:00
parent 7310c68e85
commit b2b07aa925
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
compiler-rt/lib/tsan/rtl/tsan_malloc_mac.cc
View File

@ -28,20 +28,30 @@ using namespace __tsan;
void *p = \ void *p = \
user_alloc(cur_thread(), StackTrace::GetCurrentPc(), size, alignment) user_alloc(cur_thread(), StackTrace::GetCurrentPc(), size, alignment)
#define COMMON_MALLOC_MALLOC(size) \ #define COMMON_MALLOC_MALLOC(size) \
if (cur_thread()->in_symbolizer) \
return REAL(malloc)(size); \
SCOPED_INTERCEPTOR_RAW(malloc, size); \ SCOPED_INTERCEPTOR_RAW(malloc, size); \
void *p = user_alloc(thr, pc, size) void *p = user_alloc(thr, pc, size)
#define COMMON_MALLOC_REALLOC(ptr, size) \ #define COMMON_MALLOC_REALLOC(ptr, size) \
if (cur_thread()->in_symbolizer) \
return REAL(realloc)(ptr, size); \
SCOPED_INTERCEPTOR_RAW(realloc, ptr, size); \ SCOPED_INTERCEPTOR_RAW(realloc, ptr, size); \
void *p = user_realloc(thr, pc, ptr, size); void *p = user_realloc(thr, pc, ptr, size)
#define COMMON_MALLOC_CALLOC(count, size) \ #define COMMON_MALLOC_CALLOC(count, size) \
if (cur_thread()->in_symbolizer) \
return REAL(calloc)(count, size); \
SCOPED_INTERCEPTOR_RAW(calloc, size, count); \ SCOPED_INTERCEPTOR_RAW(calloc, size, count); \
void *p = user_calloc(thr, pc, size, count); void *p = user_calloc(thr, pc, size, count)
#define COMMON_MALLOC_VALLOC(size) \ #define COMMON_MALLOC_VALLOC(size) \
SCOPED_INTERCEPTOR_RAW(valloc, size); \ if (cur_thread()->in_symbolizer) \
void *p = user_alloc(thr, pc, size, GetPageSizeCached()); return REAL(valloc)(size); \
#define COMMON_MALLOC_FREE(ptr) \ SCOPED_INTERCEPTOR_RAW(valloc, size); \
void *p = user_alloc(thr, pc, size, GetPageSizeCached())
#define COMMON_MALLOC_FREE(ptr) \
if (cur_thread()->in_symbolizer) \
return REAL(free)(ptr); \
SCOPED_INTERCEPTOR_RAW(free, ptr); \ SCOPED_INTERCEPTOR_RAW(free, ptr); \
user_free(thr, pc, ptr); user_free(thr, pc, ptr)
#define COMMON_MALLOC_SIZE(ptr) \ #define COMMON_MALLOC_SIZE(ptr) \
uptr size = user_alloc_usable_size(ptr); uptr size = user_alloc_usable_size(ptr);
#define COMMON_MALLOC_FILL_STATS(zone, stats) #define COMMON_MALLOC_FILL_STATS(zone, stats)