Fix two bugs in my patch earlier today that broke int->fp conversion on X86.

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

diff --git a/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp b/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
index 918f8258390be0d63637300ccf180f6bde92cb08..12599089f2c99f5d8618ce954ae3426546b9135e 100644 (file)
--- a/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
+++ b/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
@@ -261,7 +261,7 @@ SDOperand SelectionDAGLegalize::ExpandLegalINT_TO_FP(bool isSigned,
   }
 
   NeedsAnotherIteration = true;
-  return DAG.getNode(ISD::ADD, DestVT, Tmp1, FudgeInReg);
+  return DAG.getNode(ISD::FADD, DestVT, Tmp1, FudgeInReg);
 }
 
 /// PromoteLegalINT_TO_FP - This function is responsible for legalizing a
@@ -2810,7 +2810,7 @@ ExpandIntToFP(bool isSigned, MVT::ValueType DestTy, SDOperand Source) {
       FudgeInReg = DAG.getExtLoad(ISD::EXTLOAD, MVT::f64, DAG.getEntryNode(),
                                   CPIdx, DAG.getSrcValue(NULL), MVT::f32);
     }
-    return DAG.getNode(ISD::ADD, DestTy, SignedConv, FudgeInReg);
+    return DAG.getNode(ISD::FADD, DestTy, SignedConv, FudgeInReg);
   }
 
   // Check to see if the target has a custom way to lower this.  If so, use it.