diff --git a/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
index c9cbaf2e5d0..900a775f510 100644
--- a/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
+++ b/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
@@ -2735,6 +2735,42 @@ SDOperand DAGCombiner::visitVVECTOR_SHUFFLE(SDNode *N) {
   }
   if (isIdentity) return N->getOperand(1);
 
+  // If the LHS and the RHS are the same node, turn the RHS into an undef.
+  if (N->getOperand(0) == N->getOperand(1)) {
+    // Check the SHUFFLE mask, mapping any inputs from the 2nd operand into the
+    // first operand.
+    std::vector<SDOperand> MappedOps;
+    for (unsigned i = 0; i != NumElts; ++i) {
+      if (ShufMask.getOperand(i).getOpcode() == ISD::UNDEF ||
+          cast<ConstantSDNode>(ShufMask.getOperand(i))->getValue() < NumElts) {
+        MappedOps.push_back(ShufMask.getOperand(i));
+      } else {
+        unsigned NewIdx = 
+          cast<ConstantSDNode>(ShufMask.getOperand(i))->getValue() - NumElts;
+        MappedOps.push_back(DAG.getConstant(NewIdx, MVT::i32));
+      }
+    }
+    // Add the type/#elts values.
+    MappedOps.push_back(ShufMask.getOperand(NumElts));
+    MappedOps.push_back(ShufMask.getOperand(NumElts+1));
+
+    ShufMask = DAG.getNode(ISD::VBUILD_VECTOR, ShufMask.getValueType(),
+                           MappedOps);
+    AddToWorkList(ShufMask.Val);
+    
+    // Build the undef vector.
+    SDOperand UDVal = DAG.getNode(ISD::UNDEF, MappedOps[0].getValueType());
+    for (unsigned i = 0; i != NumElts; ++i)
+      MappedOps[i] = UDVal;
+    MappedOps[NumElts  ] = *(N->getOperand(0).Val->op_end()-2);
+    MappedOps[NumElts+1] = *(N->getOperand(0).Val->op_end()-1);
+    UDVal = DAG.getNode(ISD::VBUILD_VECTOR, MVT::Vector, MappedOps);
+    
+    return DAG.getNode(ISD::VVECTOR_SHUFFLE, MVT::Vector, 
+                       N->getOperand(0), UDVal, ShufMask,
+                       MappedOps[NumElts], MappedOps[NumElts+1]);
+  }
+  
   return SDOperand();
 }
 
diff --git a/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp b/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
index 7549569636a..225d2b39dfa 100644
--- a/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
+++ b/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
@@ -4697,8 +4697,20 @@ SDOperand SelectionDAGLegalize::PackVectorOp(SDOperand Op,
       Result = Node->getOperand(0);
     } else {
       // Returning a BUILD_VECTOR?
-      std::vector<SDOperand> Ops(Node->op_begin(), Node->op_end()-2);
-      Result = DAG.getNode(ISD::BUILD_VECTOR, NewVT, Ops);
+      
+      // If all elements of the build_vector are undefs, return an undef.
+      bool AllUndef = true;
+      for (unsigned i = 0, e = Node->getNumOperands()-2; i != e; ++i)
+        if (Node->getOperand(i).getOpcode() != ISD::UNDEF) {
+          AllUndef = false;
+          break;
+        }
+      if (AllUndef) {
+        Result = DAG.getNode(ISD::UNDEF, NewVT);
+      } else {
+        std::vector<SDOperand> Ops(Node->op_begin(), Node->op_end()-2);
+        Result = DAG.getNode(ISD::BUILD_VECTOR, NewVT, Ops);
+      }
     }
     break;
   case ISD::VINSERT_VECTOR_ELT: