[tsan] Allow memmove interceptor to be used when TSan is not initialized

kubamracek · kubamracek · commit 3d8536240acb · 2015-11-05T14:01:53.000Z
A call to memmove is used early during new thread initialization on OS X. This patch uses the `COMMON_INTERCEPTOR_NOTHING_IS_INITIALIZED` check, similarly to how we deal with other early-used interceptors. Differential Revision: http://reviews.llvm.org/D14377 llvm-svn: 252161
diff --git a/compiler-rt/lib/tsan/rtl/tsan_interceptors.cc b/compiler-rt/lib/tsan/rtl/tsan_interceptors.cc
@@ -630,9 +630,11 @@ TSAN_INTERCEPTOR(void*, memcpy, void *dst, const void *src, uptr size) {
 }
 
 TSAN_INTERCEPTOR(void*, memmove, void *dst, void *src, uptr n) {
-  SCOPED_TSAN_INTERCEPTOR(memmove, dst, src, n);
-  MemoryAccessRange(thr, pc, (uptr)dst, n, true);
-  MemoryAccessRange(thr, pc, (uptr)src, n, false);
+  if (!COMMON_INTERCEPTOR_NOTHING_IS_INITIALIZED) {
+    SCOPED_TSAN_INTERCEPTOR(memmove, dst, src, n);
+    MemoryAccessRange(thr, pc, (uptr)dst, n, true);
+    MemoryAccessRange(thr, pc, (uptr)src, n, false);
+  }
   return REAL(memmove)(dst, src, n);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -630,9 +630,11 @@ TSAN_INTERCEPTOR(void, memcpy, void dst, const void *src, uptr size) {`
`630`	`630`	`}`
`631`	`631`
`632`	`632`	`TSAN_INTERCEPTOR(void, memmove, void dst, void *src, uptr n) {`
`633`		`- SCOPED_TSAN_INTERCEPTOR(memmove, dst, src, n);`
`634`		`- MemoryAccessRange(thr, pc, (uptr)dst, n, true);`
`635`		`- MemoryAccessRange(thr, pc, (uptr)src, n, false);`
	`633`	`+ if (!COMMON_INTERCEPTOR_NOTHING_IS_INITIALIZED) {`
	`634`	`+ SCOPED_TSAN_INTERCEPTOR(memmove, dst, src, n);`
	`635`	`+ MemoryAccessRange(thr, pc, (uptr)dst, n, true);`
	`636`	`+ MemoryAccessRange(thr, pc, (uptr)src, n, false);`
	`637`	`+ }`
`636`	`638`	`return REAL(memmove)(dst, src, n);`
`637`	`639`	`}`
`638`	`640`