[PATCH] D14283: [tsan] Allow memchr interceptor to be used before initialization on OS X

[Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL251935: [tsan] Allow memchr interceptor to be used before initialization on OS X (authored by kuba.brecka).

Changed prior to commit:
  http://reviews.llvm.org/D14283?vs=39062&id=39071#toc

Repository:
  rL LLVM

http://reviews.llvm.org/D14283

Files:
  compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc

Index: compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc
===================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc
@@ -441,6 +441,8 @@
 
 #if SANITIZER_INTERCEPT_MEMCHR
 INTERCEPTOR(void*, memchr, const void *s, int c, SIZE_T n) {
+  if (COMMON_INTERCEPTOR_NOTHING_IS_INITIALIZED)
+    return internal_memchr(s, c, n);
   void *ctx;
   COMMON_INTERCEPTOR_ENTER(ctx, memchr, s, c, n);
   void *res = REAL(memchr)(s, c, n);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D14283.39071.patch
Type: text/x-patch
Size: 609 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20151103/7b4de1f6/attachment.bin>