Misc cleanup; addresses Duncan's comments on r138877.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@138887 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 2 insertions, 5 deletions

diff --git a/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp b/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp
index b0f4c3f2d3..08d6c7237a 100644
--- a/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp
+++ b/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp
@@ -139,8 +139,6 @@ void DAGTypeLegalizer::PromoteIntegerResult(SDNode *N, unsigned ResNo) {
 
 SDValue DAGTypeLegalizer::PromoteIntRes_MERGE_VALUES(SDNode *N) {
   SDValue Op = DecomposeMERGE_VALUES(N);
-  assert(Op.getValueType().isInteger()
-      && "Must decompose to an integer type!");
   return GetPromotedInteger(Op);
 }
 
@@ -1556,11 +1554,10 @@ void DAGTypeLegalizer::ExpandIntRes_ADDSUBE(SDNode *N,
   // use the new one.
   ReplaceValueWith(SDValue(N, 1), Hi.getValue(1));
 }
+
 void DAGTypeLegalizer::ExpandIntRes_MERGE_VALUES(SDNode *N, 
-                                          SDValue &Lo, SDValue &Hi) {
+                                                 SDValue &Lo, SDValue &Hi) {
   SDValue Res = DecomposeMERGE_VALUES(N);
-  assert(Res.getValueType().isInteger()
-      && "Cannot split a non-integer value.");
   SplitInteger(Res, Lo, Hi);
 }