[llvm-commits] CVS: llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp

[Jim Laskey]

Changes in directory llvm/lib/CodeGen/SelectionDAG:

SelectionDAGISel.cpp updated: 1.377 -> 1.378
---
Log message:

MERGE_VALUES unnecessary.

---
Diffs of the changes:  (+4 -12)

 SelectionDAGISel.cpp |   16 ++++------------
 1 files changed, 4 insertions(+), 12 deletions(-)


Index: llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1.377 
llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1.378
--- llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1.377    Sun Feb 25 
20:56:58 2007
+++ llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp  Wed Feb 28 12:37:04 2007
@@ -2105,16 +2105,12 @@
       setValue(&I, Op);
       DAG.setRoot(Op.getValue(1));
     } else {
-      SDOperand Op = DAG.getNode(ISD::MERGE_VALUES, TLI.getPointerTy(),
-                                 DAG.getConstant(0, TLI.getPointerTy()),
-                                 DAG.getRoot());
-      setValue(&I, Op);
-      DAG.setRoot(Op.getValue(1));
+      setValue(&I, DAG.getConstant(0, TLI.getPointerTy()));
     }
     return 0;
   }
 
-  case Intrinsic::eh_handlers: {
+  case Intrinsic::eh_selector: {
     MachineModuleInfo *MMI = DAG.getMachineModuleInfo();
     
     if (MMI) {
@@ -2147,7 +2143,7 @@
       if (Reg) CurMBB->addLiveIn(Reg);
 
       // Insert the EHSELECTION instruction.
-      SDVTList VTs = DAG.getVTList(TLI.getPointerTy(), MVT::Other);
+      SDVTList VTs = DAG.getVTList(MVT::i32, MVT::Other);
       SDOperand Ops[2];
       Ops[0] = getValue(I.getOperand(1));
       Ops[1] = getRoot();
@@ -2155,11 +2151,7 @@
       setValue(&I, Op);
       DAG.setRoot(Op.getValue(1));
     } else {
-      SDOperand Op = DAG.getNode(ISD::MERGE_VALUES, TLI.getPointerTy(),
-                                 DAG.getConstant(0, TLI.getPointerTy()),
-                                 getValue(I.getOperand(1)));
-      setValue(&I, Op);
-      DAG.setRoot(Op.getValue(1));
+      setValue(&I, DAG.getConstant(0, MVT::i32));
     }
     
     return 0;



_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits