[compiler-rt] r180184 - tsan: fix stack traces for malloc and free

[Dmitry Vyukov]

Author: dvyukov
Date: Wed Apr 24 06:16:47 2013
New Revision: 180184

URL: http://llvm.org/viewvc/llvm-project?rev=180184&view=rev
Log:
tsan: fix stack traces for malloc and free

Added:
    compiler-rt/trunk/lib/tsan/lit_tests/malloc_stack.cc
Modified:
    compiler-rt/trunk/lib/tsan/rtl/tsan_rtl.cc

Added: compiler-rt/trunk/lib/tsan/lit_tests/malloc_stack.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/lit_tests/malloc_stack.cc?rev=180184&view=auto
==============================================================================
--- compiler-rt/trunk/lib/tsan/lit_tests/malloc_stack.cc (added)
+++ compiler-rt/trunk/lib/tsan/lit_tests/malloc_stack.cc Wed Apr 24 06:16:47 2013
@@ -0,0 +1,25 @@
+// RUN: %clang_tsan -O1 %s -o %t && %t 2>&1 | FileCheck %s
+#include <pthread.h>
+#include <unistd.h>
+
+_Atomic(int*) p;
+
+void *thr(void *a) {
+  sleep(1);
+  int *pp = __c11_atomic_load(&p, __ATOMIC_RELAXED);
+  *pp = 42;
+  return 0;
+}
+
+int main() {
+  pthread_t th;
+  pthread_create(&th, 0, thr, p);
+  __c11_atomic_store(&p, new int, __ATOMIC_RELAXED);
+  pthread_join(th, 0);
+}
+
+// CHECK: data race
+// CHECK:   Previous write
+// CHECK:     #0 operator new
+// CHECK:   Location is heap block
+// CHECK:     #0 operator new

Modified: compiler-rt/trunk/lib/tsan/rtl/tsan_rtl.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_rtl.cc?rev=180184&r1=180183&r2=180184&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/rtl/tsan_rtl.cc (original)
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_rtl.cc Wed Apr 24 06:16:47 2013
@@ -584,6 +584,8 @@ void MemoryRangeFreed(ThreadState *thr,
   thr->is_freeing = true;
   MemoryAccessRange(thr, pc, addr, size, true);
   thr->is_freeing = false;
+  thr->fast_state.IncrementEpoch();
+  TraceAddEvent(thr, thr->fast_state, EventTypeMop, pc);
   Shadow s(thr->fast_state);
   s.ClearIgnoreBit();
   s.MarkAsFreed();
@@ -593,6 +595,8 @@ void MemoryRangeFreed(ThreadState *thr,
 }
 
 void MemoryRangeImitateWrite(ThreadState *thr, uptr pc, uptr addr, uptr size) {
+  thr->fast_state.IncrementEpoch();
+  TraceAddEvent(thr, thr->fast_state, EventTypeMop, pc);
   Shadow s(thr->fast_state);
   s.ClearIgnoreBit();
   s.SetWrite(true);