commit 2e7f29f042eb203215eb0ccb12ebc5b811fa4c7a
author Dmitry Vyukov <dvyukov@google.com> Mon Mar 18 15:49:07 2013 +0000
committer Dmitry Vyukov <dvyukov@google.com> Mon Mar 18 15:49:07 2013 +0000
tree 93d5009b1aa6794ed1a677777fbba455646df182
parent 2f69d405ccd7d0d9ea653dd4c65e65d13753898c

tsan: mark shadow for thread stack as "don't need" when thread exits

llvm-svn: 177288

compiler-rt/lib/tsan/rtl/tsan_rtl_thread.cc

diff --git a/compiler-rt/lib/tsan/rtl/tsan_rtl_thread.cc b/compiler-rt/lib/tsan/rtl/tsan_rtl_thread.cc
index 238baef..0372bb5 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_rtl_thread.cc
+++ b/compiler-rt/lib/tsan/rtl/tsan_rtl_thread.cc
@@ -200,9 +200,8 @@
   GetThreadStackAndTls(tid == 0, &stk_addr, &stk_size, &tls_addr, &tls_size);
 
   if (tid) {
-    if (stk_addr && stk_size) {
+    if (stk_addr && stk_size)
       MemoryResetRange(thr, /*pc=*/ 1, stk_addr, stk_size);
-    }
 
     if (tls_addr && tls_size) {
       // Check that the thr object is in tls;
@@ -225,17 +224,10 @@
 void ThreadFinish(ThreadState *thr) {
   CHECK_GT(thr->in_rtl, 0);
   StatInc(thr, StatThreadFinish);
-  // FIXME: Treat it as write.
   if (thr->stk_addr && thr->stk_size)
-    MemoryResetRange(thr, /*pc=*/ 3, thr->stk_addr, thr->stk_size);
-  if (thr->tls_addr && thr->tls_size) {
-    const uptr thr_beg = (uptr)thr;
-    const uptr thr_end = (uptr)thr + sizeof(*thr);
-    // Since the thr object is huge, skip it.
-    MemoryResetRange(thr, /*pc=*/ 4, thr->tls_addr, thr_beg - thr->tls_addr);
-    MemoryResetRange(thr, /*pc=*/ 5,
-        thr_end, thr->tls_addr + thr->tls_size - thr_end);
-  }
+    DontNeedShadowFor(thr->stk_addr, thr->stk_size);
+  if (thr->tls_addr && thr->tls_size)
+    DontNeedShadowFor(thr->tls_addr, thr->tls_size);
   thr->is_alive = false;
   Context *ctx = CTX();
   ctx->thread_registry->FinishThread(thr->tid);