commit d4429214a2dffcfd8f97956ac8b1a67c4795d242
author Kostya Serebryany <kcc@google.com> Wed Jun 26 09:49:52 2013 +0000
committer Kostya Serebryany <kcc@google.com> Wed Jun 26 09:49:52 2013 +0000
tree fca1facc18e3437b8f5b092c3dda1db117d39eab
parent 20985711c76b8799d689a9c0e416b68896333c23

[asan] workaround for PR16277: don't instrument AllocaInstr with alignment more than the redzone size

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

lib/Transforms/Instrumentation/AddressSanitizer.cpp

diff --git a/lib/Transforms/Instrumentation/AddressSanitizer.cpp b/lib/Transforms/Instrumentation/AddressSanitizer.cpp
index 67a8325..417fd76 100644
--- a/lib/Transforms/Instrumentation/AddressSanitizer.cpp
+++ b/lib/Transforms/Instrumentation/AddressSanitizer.cpp
@@ -451,7 +451,7 @@
 
     StackAlignment = std::max(StackAlignment, AI.getAlignment());
     AllocaVec.push_back(&AI);
-    uint64_t AlignedSize =  getAlignedAllocaSize(&AI);
+    uint64_t AlignedSize = getAlignedAllocaSize(&AI);
     TotalStackSize += AlignedSize;
   }
 
@@ -488,6 +488,7 @@
   bool isInterestingAlloca(AllocaInst &AI) {
     return (!AI.isArrayAllocation() &&
             AI.isStaticAlloca() &&
+            AI.getAlignment() <= RedzoneSize() &&
             AI.getAllocatedType()->isSized());
   }