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

[Kuba Brecka via llvm-commits]

kubabrecka created this revision.
kubabrecka added reviewers: dvyukov, samsonov, glider, kcc.
kubabrecka added subscribers: llvm-commits, zaks.anna, ismailp.

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.

http://reviews.llvm.org/D14710

Files:
  lib/tsan/rtl/tsan_malloc_mac.cc

Index: lib/tsan/rtl/tsan_malloc_mac.cc
===================================================================
--- lib/tsan/rtl/tsan_malloc_mac.cc
+++ lib/tsan/rtl/tsan_malloc_mac.cc
@@ -28,20 +28,30 @@
   void *p =                                     \
       user_alloc(cur_thread(), StackTrace::GetCurrentPc(), size, alignment)
 #define COMMON_MALLOC_MALLOC(size)      \
+  if (cur_thread()->in_symbolizer)      \
+    return REAL(malloc)(size);          \
   SCOPED_INTERCEPTOR_RAW(malloc, 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); \
-  void *p = user_realloc(thr, pc, ptr, size);
-#define COMMON_MALLOC_CALLOC(count, size) \
+  void *p = user_realloc(thr, pc, ptr, size)
+#define COMMON_MALLOC_CALLOC(count, size)      \
+  if (cur_thread()->in_symbolizer)             \
+    return REAL(calloc)(count, size);          \
   SCOPED_INTERCEPTOR_RAW(calloc, size, count); \
-  void *p = user_calloc(thr, pc, size, count);
-#define COMMON_MALLOC_VALLOC(size) \
-  SCOPED_INTERCEPTOR_RAW(valloc, size); \
-  void *p = user_alloc(thr, pc, size, GetPageSizeCached());
-#define COMMON_MALLOC_FREE(ptr) \
+  void *p = user_calloc(thr, pc, size, count)
+#define COMMON_MALLOC_VALLOC(size)                          \
+  if (cur_thread()->in_symbolizer)                          \
+    return REAL(valloc)(size);                              \
+  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); \
-  user_free(thr, pc, ptr);
+  user_free(thr, pc, ptr)
 #define COMMON_MALLOC_SIZE(ptr) \
   uptr size = user_alloc_usable_size(ptr);
 #define COMMON_MALLOC_FILL_STATS(zone, stats)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D14710.40302.patch
Type: text/x-patch
Size: 2041 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20151116/0bd6de18/attachment.bin>