diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
index 7a62da55712..80cb25e3c34 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
@@ -315,6 +315,7 @@ unsigned FunctionLoweringInfo::CreateRegForValue(const Value *V) {
     while (NumElts > 1 && !TLI.isTypeLegal(VecTy)) {
       NumElts >>= 1;
       NumVectorRegs <<= 1;
+      VecTy = getVectorType(EltTy, NumElts);
     }
 
     // Check that VecTy isn't a 1-element vector.