1 files changed, 4 insertions, 18 deletions
diff --git a/lib/Target/Sparc/SparcISelDAGToDAG.cpp b/lib/Target/Sparc/SparcISelDAGToDAG.cpp
index c67b5aa592..96b442cfb6 100644
--- a/lib/Target/Sparc/SparcISelDAGToDAG.cpp
+++ b/lib/Target/Sparc/SparcISelDAGToDAG.cpp
@@ -136,8 +136,6 @@ SparcV8TargetLowering::SparcV8TargetLowering(TargetMachine &TM)
   setOperationAction(ISD::SELECT_CC, MVT::f32, Custom);
   setOperationAction(ISD::SELECT_CC, MVT::f64, Custom);
   
-  setOperationAction(ISD::DYNAMIC_STACKALLOC, MVT::i32, Custom);
-  
   // V8 has no intrinsics for these particular operations.
   setOperationAction(ISD::MEMMOVE, MVT::Other, Expand);
   setOperationAction(ISD::MEMSET, MVT::Other, Expand);
@@ -163,9 +161,12 @@ SparcV8TargetLowering::SparcV8TargetLowering(TargetMachine &TM)
   setOperationAction(ISD::DEBUG_LOC, MVT::Other, Expand);
   setOperationAction(ISD::DEBUG_LABEL, MVT::Other, Expand);
 
-  // Not implemented yet.
+  // Expand these to their default code.
   setOperationAction(ISD::STACKSAVE, MVT::Other, Expand); 
   setOperationAction(ISD::STACKRESTORE, MVT::Other, Expand);
+  setOperationAction(ISD::DYNAMIC_STACKALLOC, MVT::i32, Expand);
+
+  setStackPointerRegisterToSaveRestore(V8::O6);
 
   computeRegisterProperties();
 }
@@ -701,21 +702,6 @@ LowerOperation(SDOperand Op, SelectionDAG &DAG) {
     return DAG.getNode(Opc, TrueVal.getValueType(), TrueVal, FalseVal, 
                        DAG.getConstant(CC, MVT::i32), CompareFlag);
   }
-  case ISD::DYNAMIC_STACKALLOC: {
-    SDOperand Chain = Op.getOperand(0);
-    SDOperand Size  = Op.getOperand(1);
-
-    SDOperand SP = DAG.getCopyFromReg(Chain, V8::O6, MVT::i32);
-    Chain = SP.getValue(1);
-    SDOperand Res = DAG.getNode(ISD::SUB, MVT::i32, SP, Size);
-    Chain = DAG.getCopyToReg(Chain, V8::O6, Res);
-
-    std::vector<MVT::ValueType> VTs(Op.Val->value_begin(), Op.Val->value_end());
-    std::vector<SDOperand> Ops;
-    Ops.push_back(Res);
-    Ops.push_back(Chain);
-    return DAG.getNode(ISD::MERGE_VALUES, VTs, Ops);
-  }
   }
 }