diff options
| author | Cameron Zwarich <zwarich@apple.com> | 2011-10-11 21:26:40 +0000 |
|---|---|---|
| committer | Cameron Zwarich <zwarich@apple.com> | 2011-10-11 21:26:40 +0000 |
| commit | c055a8782ee66f6041cc00997857d98d6b9e9b4a (patch) | |
| tree | 3ec6f540bfff68e937f23ad0811838cd94b87726 | |
| parent | b07a3d68972039426a87f1cac82e348e3bb1877b (diff) | |
| download | llvm-c055a8782ee66f6041cc00997857d98d6b9e9b4a.tar.gz llvm-c055a8782ee66f6041cc00997857d98d6b9e9b4a.tar.bz2 llvm-c055a8782ee66f6041cc00997857d98d6b9e9b4a.tar.xz | |
Fix PR11106 by correcting a typo that has been in the code for over a year. This
would have never worked, since the element type of a vector type is never a
vector type. Also fix the conditional to be more direct in checking whether
EltTy is a vector type.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@141713 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Transforms/Scalar/ScalarReplAggregates.cpp | 4 | ||||
| -rw-r--r-- | test/Transforms/ScalarRepl/2011-10-11-VectorMemset.ll | 22 |
2 files changed, 24 insertions, 2 deletions
diff --git a/lib/Transforms/Scalar/ScalarReplAggregates.cpp b/lib/Transforms/Scalar/ScalarReplAggregates.cpp index 3a4fac07ad..c6d9123d66 100644 --- a/lib/Transforms/Scalar/ScalarReplAggregates.cpp +++ b/lib/Transforms/Scalar/ScalarReplAggregates.cpp @@ -2144,8 +2144,8 @@ void SROA::RewriteMemIntrinUserOfAlloca(MemIntrinsic *MI, Instruction *Inst, assert(StoreVal->getType() == ValTy && "Type mismatch!"); // If the requested value was a vector constant, create it. - if (EltTy != ValTy) { - unsigned NumElts = cast<VectorType>(ValTy)->getNumElements(); + if (EltTy->isVectorTy()) { + unsigned NumElts = cast<VectorType>(EltTy)->getNumElements(); SmallVector<Constant*, 16> Elts(NumElts, StoreVal); StoreVal = ConstantVector::get(Elts); } diff --git a/test/Transforms/ScalarRepl/2011-10-11-VectorMemset.ll b/test/Transforms/ScalarRepl/2011-10-11-VectorMemset.ll new file mode 100644 index 0000000000..9e31231492 --- /dev/null +++ b/test/Transforms/ScalarRepl/2011-10-11-VectorMemset.ll @@ -0,0 +1,22 @@ +; RUN: opt < %s -S -scalarrepl | FileCheck %s +target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64" +target triple = "x86_64-apple-darwin11.0.1" + +; CHECK: test +; CHECK-NOT: alloca + +define void @test() nounwind { +entry: + %a156286 = alloca [4 x <4 x float>], align 16 + br i1 undef, label %cif_done, label %for_test158.preheader + +for_test158.preheader: ; preds = %entry + %a156286305 = bitcast [4 x <4 x float>]* %a156286 to i8* + call void @llvm.memset.p0i8.i64(i8* %a156286305, i8 -1, i64 64, i32 16, i1 false) + unreachable + +cif_done: ; preds = %entry + ret void +} + +declare void @llvm.memset.p0i8.i64(i8* nocapture, i8, i64, i32, i1) nounwind |