Revert r137114

[oota-llvm.git] / lib / Target / X86 / X86ISelLowering.cpp

diff --git a/lib/Target/X86/X86ISelLowering.cpp b/lib/Target/X86/X86ISelLowering.cpp
index b8197edb2b15eb64c42fa69384f0170a26a7e655..71b23e2ccb0cf6fbf85262e4412450fd16a8f4af 100644 (file)
--- a/lib/Target/X86/X86ISelLowering.cpp
+++ b/lib/Target/X86/X86ISelLowering.cpp
@@ -969,9 +969,6 @@ X86TargetLowering::X86TargetLowering(X86TargetMachine &TM)
     setOperationAction(ISD::SINT_TO_FP,         MVT::v8i32, Legal);
     setOperationAction(ISD::FP_ROUND,           MVT::v4f32, Legal);
 
-    // sint_to_fp between different vector types needs custom handling
-    setOperationAction(ISD::SINT_TO_FP,         MVT::v4i32, Custom);
-
     setOperationAction(ISD::CONCAT_VECTORS,     MVT::v4f64,  Custom);
     setOperationAction(ISD::CONCAT_VECTORS,     MVT::v4i64,  Custom);
     setOperationAction(ISD::CONCAT_VECTORS,     MVT::v8f32,  Custom);
@@ -7081,24 +7078,6 @@ SDValue X86TargetLowering::LowerShiftParts(SDValue Op, SelectionDAG &DAG) const
 SDValue X86TargetLowering::LowerSINT_TO_FP(SDValue Op,
                                            SelectionDAG &DAG) const {
   EVT SrcVT = Op.getOperand(0).getValueType();
-  EVT DstVT = Op.getValueType();
-  DebugLoc dl = Op.getDebugLoc();
-
-  if (SrcVT.isVector() && DstVT.isVector()) {
-    unsigned SrcVTSize = SrcVT.getSizeInBits();
-    unsigned DstVTSize = DstVT.getSizeInBits();
-
-    // Support directly by the target
-    if (SrcVTSize == DstVTSize)
-      return Op;
-
-    // Handle v4f64 = sitofp v4i32
-    if (DstVT != MVT::v4f64 && SrcVT != MVT::v4i32)
-      return SDValue();
-
-    SDValue V = DAG.getNode(ISD::SINT_TO_FP, dl, MVT::v4f32, Op.getOperand(0));
-    return DAG.getNode(ISD::FP_EXTEND, dl, DstVT, V);
-  }
 
   if (SrcVT.isVector())
     return SDValue();
@@ -7115,6 +7094,7 @@ SDValue X86TargetLowering::LowerSINT_TO_FP(SDValue Op,
     return Op;
   }
 
+  DebugLoc dl = Op.getDebugLoc();
   unsigned Size = SrcVT.getSizeInBits()/8;
   MachineFunction &MF = DAG.getMachineFunction();
   int SSFI = MF.getFrameInfo()->CreateStackObject(Size, Size, false);