From 5814a88ce9ebe415015b37477c841304fa8b7b1a Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Mon, 17 Dec 2012 13:51:03 +0000 Subject: [PATCH] Hoist a convertValue call to the two paths where it is needed. I noticed this while looking at r170328. We only ever do a vector rewrite when the alloca *is* the vector type, so it's good to not paper over bugs here by doing a convertValue that isn't needed. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@170331 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/Scalar/SROA.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/Transforms/Scalar/SROA.cpp b/lib/Transforms/Scalar/SROA.cpp index 01c7b421b28..ef16f46580b 100644 --- a/lib/Transforms/Scalar/SROA.cpp +++ b/lib/Transforms/Scalar/SROA.cpp @@ -2807,6 +2807,7 @@ private: assert(V->getType() == IntTy && "Wrong type for an alloca wide integer!"); } + V = convertValue(TD, IRB, V, AllocaTy); } else { // Established these invariants above. assert(BeginOffset == NewAllocaBeginOffset); @@ -2814,13 +2815,13 @@ private: V = getIntegerSplat(IRB, II.getValue(), TD.getTypeSizeInBits(ScalarTy)/8); - if (VectorType *AllocaVecTy = dyn_cast(AllocaTy)) V = getVectorSplat(IRB, V, AllocaVecTy->getNumElements()); + + V = convertValue(TD, IRB, V, AllocaTy); } - Value *New = IRB.CreateAlignedStore(convertValue(TD, IRB, V, AllocaTy), - &NewAI, NewAI.getAlignment(), + Value *New = IRB.CreateAlignedStore(V, &NewAI, NewAI.getAlignment(), II.isVolatile()); (void)New; DEBUG(dbgs() << " to: " << *New << "\n");