commit 7a0bba457ee05ced3adf37a0c0790d0ed23a5446
author Kostya Serebryany <kcc@google.com> Wed Jun 26 12:16:05 2013 +0000
committer Kostya Serebryany <kcc@google.com> Wed Jun 26 12:16:05 2013 +0000
tree 8c886622f1ba0a48aafb1119023ef8360506eb5a
parent 5ab0e47ce6eaaaddd743d3fdaf255ef16f11a685

[asan] initialize fake_stack lazily and increase its maximal size. This makes -fsanitize=address,use-after-return more robust: all SPEC tests pass now. In the default mode thread stacks become a bit smaller.

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@184934 91177308-0d34-0410-b5e6-96231b3b80d8

lib/asan/asan_thread.cc

diff --git a/lib/asan/asan_thread.cc b/lib/asan/asan_thread.cc
index ef43eb6..39153bf 100644
--- a/lib/asan/asan_thread.cc
+++ b/lib/asan/asan_thread.cc
@@ -102,7 +102,7 @@
   // some code may still be executing in later TSD destructors
   // and we don't want it to have any poisoned stack.
   ClearShadowForThreadStackAndTLS();
-  fake_stack().Cleanup();
+  DeleteFakeStack();
   uptr size = RoundUpTo(sizeof(AsanThread), GetPageSizeCached());
   UnmapOrDie(this, size);
 }
@@ -118,7 +118,7 @@
            tid(), (void*)stack_bottom_, (void*)stack_top_,
            stack_top_ - stack_bottom_, &local);
   }
-  fake_stack_.Init(stack_size());
+  fake_stack_ = 0;  // Will be initialized lazily if needed.
   AsanPlatformThreadInit();
 }
 
@@ -166,8 +166,8 @@
   uptr bottom = 0;
   if (AddrIsInStack(addr)) {
     bottom = stack_bottom();
-  } else {
-    bottom = fake_stack().AddrIsInFakeStack(addr);
+  } else if (fake_stack()) {
+    bottom = fake_stack()->AddrIsInFakeStack(addr);
     CHECK(bottom);
     *offset = addr - bottom;
     *frame_pc = ((uptr*)bottom)[2];
@@ -203,9 +203,11 @@
                                        void *addr) {
   AsanThreadContext *tctx = static_cast<AsanThreadContext*>(tctx_base);
   AsanThread *t = tctx->thread;
-  return (t && t->fake_stack().StackSize() &&
-          (t->fake_stack().AddrIsInFakeStack((uptr)addr) ||
-           t->AddrIsInStack((uptr)addr)));
+  if (!t) return false;
+  if (t->AddrIsInStack((uptr)addr)) return true;
+  if (t->fake_stack() && t->fake_stack()->AddrIsInFakeStack((uptr)addr))
+    return true;
+  return false;
 }
 
 AsanThread *GetCurrentThread() {