maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

tsan: more robust current thread stack restoration 

llvm-svn: 163089
This commit is contained in:
Dmitry Vyukov 2012-09-02 11:23:39 +00:00
parent c6fd820937
commit 72cddf33d9
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler-rt/lib/tsan/rtl/tsan_rtl_report.cc
View File

@ -399,6 +399,11 @@ void ReportRace(ThreadState *thr) {
Shadow s(thr->racy_state[i]);
RestoreStack(s.tid(), s.epoch(), &traces[i]);
}
// Failure to restore stack of the current thread
// was observed on free() interceptor called from pthread.
// Just get the current shadow stack instead.
if (traces[0].IsEmpty())
traces[0].ObtainCurrent(thr, 0);
if (HandleRacyStacks(thr, traces, addr_min, addr_max))
return;
@ -408,9 +413,6 @@ void ReportRace(ThreadState *thr) {
rep.AddMemoryAccess(addr, s, &traces[i]);
}
// Ensure that we have at least something for the current thread.
DCHECK_EQ(traces[0].IsEmpty(), false);
for (uptr i = 0; i < kMop; i++) {
FastState s(thr->racy_state[i]);
ThreadContext *tctx = ctx->threads[s.tid()];