From 2ab5a48dbe9a02fff9cce141f791bb6c47f9ac3e Mon Sep 17 00:00:00 2001
From: Kostya Serebryany <kcc@google.com>
Date: Fri, 20 Sep 2013 09:16:21 +0000
Subject: [PATCH] [asan] nuke yet another async-signal-safety bug in UAR (oh,
 my)

llvm-svn: 191080
---
 compiler-rt/lib/asan/asan_fake_stack.h | 1 +
 compiler-rt/lib/asan/asan_thread.h     | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler-rt/lib/asan/asan_fake_stack.h b/compiler-rt/lib/asan/asan_fake_stack.h
index 6832e22157be..3f72b8214eec 100644
--- a/compiler-rt/lib/asan/asan_fake_stack.h
+++ b/compiler-rt/lib/asan/asan_fake_stack.h
@@ -77,6 +77,7 @@ class FakeStack {
   }
 
   void Destroy() {
+    PoisonAll(0);
     UnmapOrDie(this, RequiredSize(stack_size_log_));
   }
 
diff --git a/compiler-rt/lib/asan/asan_thread.h b/compiler-rt/lib/asan/asan_thread.h
index bd92cfe4c6dd..e77f16c66051 100644
--- a/compiler-rt/lib/asan/asan_thread.h
+++ b/compiler-rt/lib/asan/asan_thread.h
@@ -77,7 +77,6 @@ class AsanThread {
 
   void DeleteFakeStack() {
     if (!fake_stack_) return;
-    fake_stack_->PoisonAll(0);
     FakeStack *t = fake_stack_;
     fake_stack_ = 0;
     SetTLSFakeStack(0);