diff options
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/CodeGen/StackProtector.cpp | 7 | ||||
| -rw-r--r-- | llvm/test/CodeGen/X86/splat-scalar-load.ll | 2 | 
2 files changed, 2 insertions, 7 deletions
diff --git a/llvm/lib/CodeGen/StackProtector.cpp b/llvm/lib/CodeGen/StackProtector.cpp index 1f0e5a2711a..43a6ad8c97a 100644 --- a/llvm/lib/CodeGen/StackProtector.cpp +++ b/llvm/lib/CodeGen/StackProtector.cpp @@ -123,16 +123,11 @@ bool StackProtector::RequiresStackProtector() const {            // protectors.            return true; -        if (ArrayType *AT = dyn_cast<ArrayType>(AI->getAllocatedType())) { -          // We apparently only care about character arrays. -          if (!AT->getElementType()->isIntegerTy(8)) -            continue; - +        if (ArrayType *AT = dyn_cast<ArrayType>(AI->getAllocatedType()))            // If an array has more than SSPBufferSize bytes of allocated space,            // then we emit stack protectors.            if (SSPBufferSize <= TD->getTypeAllocSize(AT))              return true; -        }        }    } diff --git a/llvm/test/CodeGen/X86/splat-scalar-load.ll b/llvm/test/CodeGen/X86/splat-scalar-load.ll index 2b13029896e..81a072fb396 100644 --- a/llvm/test/CodeGen/X86/splat-scalar-load.ll +++ b/llvm/test/CodeGen/X86/splat-scalar-load.ll @@ -1,7 +1,7 @@  ; RUN: llc < %s -mtriple=i386-apple-darwin -mattr=+sse2 | FileCheck %s  ; rdar://7434544 -define <2 x i64> @t2() nounwind ssp { +define <2 x i64> @t2() nounwind {  entry:  ; CHECK: t2:  ; CHECK: pshufd	$85, (%esp), %xmm0  | 

