diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
index 1140e20a440..97e12a4a0e9 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
@@ -759,9 +759,12 @@ static SDOperand getCopyFromParts(SelectionDAG &DAG,
     }
   }
 
-  if (MVT::isFloatingPoint(PartVT) && MVT::isFloatingPoint(ValueVT))
-    return DAG.getNode(ISD::FP_ROUND, ValueVT, Val,
-                       DAG.getIntPtrConstant(TruncExact));
+  if (MVT::isFloatingPoint(PartVT) && MVT::isFloatingPoint(ValueVT)) {
+    if (ValueVT < Val.getValueType())
+      return DAG.getNode(ISD::FP_ROUND, ValueVT, Val,
+                         DAG.getIntPtrConstant(TruncExact));
+    return DAG.getNode(ISD::FP_EXTEND, ValueVT, Val);
+  }
 
   if (MVT::getSizeInBits(PartVT) == MVT::getSizeInBits(ValueVT))
     return DAG.getNode(ISD::BIT_CONVERT, ValueVT, Val);