MERGE_VALUES unnecessary.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@34750 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jim Laskey
2007-02-28 18:37:04 +00:00
parent 7e08570379
commit 64ce0ca90d

View File

@@ -2105,16 +2105,12 @@ SelectionDAGLowering::visitIntrinsicCall(CallInst &I, unsigned Intrinsic) {
setValue(&I, Op); setValue(&I, Op);
DAG.setRoot(Op.getValue(1)); DAG.setRoot(Op.getValue(1));
} else { } else {
SDOperand Op = DAG.getNode(ISD::MERGE_VALUES, TLI.getPointerTy(), setValue(&I, DAG.getConstant(0, TLI.getPointerTy()));
DAG.getConstant(0, TLI.getPointerTy()),
DAG.getRoot());
setValue(&I, Op);
DAG.setRoot(Op.getValue(1));
} }
return 0; return 0;
} }
case Intrinsic::eh_handlers: { case Intrinsic::eh_selector: {
MachineModuleInfo *MMI = DAG.getMachineModuleInfo(); MachineModuleInfo *MMI = DAG.getMachineModuleInfo();
if (MMI) { if (MMI) {
@@ -2147,7 +2143,7 @@ SelectionDAGLowering::visitIntrinsicCall(CallInst &I, unsigned Intrinsic) {
if (Reg) CurMBB->addLiveIn(Reg); if (Reg) CurMBB->addLiveIn(Reg);
// Insert the EHSELECTION instruction. // Insert the EHSELECTION instruction.
SDVTList VTs = DAG.getVTList(TLI.getPointerTy(), MVT::Other); SDVTList VTs = DAG.getVTList(MVT::i32, MVT::Other);
SDOperand Ops[2]; SDOperand Ops[2];
Ops[0] = getValue(I.getOperand(1)); Ops[0] = getValue(I.getOperand(1));
Ops[1] = getRoot(); Ops[1] = getRoot();
@@ -2155,11 +2151,7 @@ SelectionDAGLowering::visitIntrinsicCall(CallInst &I, unsigned Intrinsic) {
setValue(&I, Op); setValue(&I, Op);
DAG.setRoot(Op.getValue(1)); DAG.setRoot(Op.getValue(1));
} else { } else {
SDOperand Op = DAG.getNode(ISD::MERGE_VALUES, TLI.getPointerTy(), setValue(&I, DAG.getConstant(0, MVT::i32));
DAG.getConstant(0, TLI.getPointerTy()),
getValue(I.getOperand(1)));
setValue(&I, Op);
DAG.setRoot(Op.getValue(1));
} }
return 0; return 0;