OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

tsan: fix stack traces for malloc and free 

llvm-svn: 180184
This commit is contained in:
Dmitry Vyukov 2013-04-24 11:16:47 +00:00
parent 7a8535d2f2
commit 368d97e33c
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
compiler-rt/lib/tsan/lit_tests/malloc_stack.cc Normal file
View File

@ -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

4
compiler-rt/lib/tsan/rtl/tsan_rtl.cc
View File

@ -584,6 +584,8 @@ void MemoryRangeFreed(ThreadState *thr, uptr pc, uptr addr, uptr size) {
thr->is_freeing = true; thr->is_freeing = true;
MemoryAccessRange(thr, pc, addr, size, true); MemoryAccessRange(thr, pc, addr, size, true);
thr->is_freeing = false; thr->is_freeing = false;
thr->fast_state.IncrementEpoch();
TraceAddEvent(thr, thr->fast_state, EventTypeMop, pc);
Shadow s(thr->fast_state); Shadow s(thr->fast_state);
s.ClearIgnoreBit(); s.ClearIgnoreBit();
s.MarkAsFreed(); s.MarkAsFreed();
@ -593,6 +595,8 @@ void MemoryRangeFreed(ThreadState *thr, uptr pc, uptr addr, uptr size) {
} }
void MemoryRangeImitateWrite(ThreadState *thr, uptr pc, uptr addr, uptr size) { 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); Shadow s(thr->fast_state);
s.ClearIgnoreBit(); s.ClearIgnoreBit();
s.SetWrite(true); s.SetWrite(true);