From: Vitaly Buka <vitalybuka@google.com>
Date: Mon, 7 Aug 2017 07:35:33 +0000 (+0000)
Subject: [asan] Fix asan dynamic shadow check before copyArgsPassedByValToAllocas
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1b06abdb2cd64e0db124b3df9fe126581e6f4641;p=llvm

[asan] Fix asan dynamic shadow check before copyArgsPassedByValToAllocas

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

diff --git a/lib/Transforms/Instrumentation/AddressSanitizer.cpp b/lib/Transforms/Instrumentation/AddressSanitizer.cpp
index d437ae93f79..f8d255273b2 100644
--- a/lib/Transforms/Instrumentation/AddressSanitizer.cpp
+++ b/lib/Transforms/Instrumentation/AddressSanitizer.cpp
@@ -756,7 +756,7 @@ struct FunctionStackPoisoner : public InstVisitor<FunctionStackPoisoner> {
   bool runOnFunction() {
     if (!ClStack) return false;
 
-    if (ClRedzoneByvalArgs && !ClForceDynamicShadow)
+    if (ClRedzoneByvalArgs && Mapping.Offset != kDynamicShadowSentinel)
       copyArgsPassedByValToAllocas();
 
     // Collect alloca, ret, lifetime instructions etc.