From 1fb5c13e3acc890f8ec8154721464dae336ee5ec Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Mon, 23 Dec 2013 14:51:56 +0000 Subject: Fix Scalarizer insertion point when replacing PHIs with insertelements If the Scalarizer scalarized a vector PHI but could not scalarize all uses of it, it would insert a series of insertelements to reconstruct the vector PHI value from the scalar ones. The problem was that it would emit these insertelements immediately after the PHI, even if there were other PHIs after it. llvm-svn: 197909 --- llvm/lib/Transforms/Scalar/Scalarizer.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'llvm/lib/Transforms/Scalar/Scalarizer.cpp') diff --git a/llvm/lib/Transforms/Scalar/Scalarizer.cpp b/llvm/lib/Transforms/Scalar/Scalarizer.cpp index 33ccb7350d8..e614ecee53a 100644 --- a/llvm/lib/Transforms/Scalar/Scalarizer.cpp +++ b/llvm/lib/Transforms/Scalar/Scalarizer.cpp @@ -638,8 +638,11 @@ bool Scalarizer::finish() { // InsertElements. Type *Ty = Op->getType(); Value *Res = UndefValue::get(Ty); + BasicBlock *BB = Op->getParent(); unsigned Count = Ty->getVectorNumElements(); - IRBuilder<> Builder(Op->getParent(), Op); + IRBuilder<> Builder(BB, Op); + if (isa(Op)) + Builder.SetInsertPoint(BB, BB->getFirstInsertionPt()); for (unsigned I = 0; I < Count; ++I) Res = Builder.CreateInsertElement(Res, CV[I], Builder.getInt32(I), Op->getName() + ".upto" + Twine(I)); -- cgit v1.2.3