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

[Jim Laskey]

Changes in directory llvm/lib/CodeGen/SelectionDAG:

SelectionDAGISel.cpp updated: 1.373 -> 1.374
---
Log message:

Deal with cases when MMI is not requested.

---
Diffs of the changes:  (+14 -0)

 SelectionDAGISel.cpp |   14 ++++++++++++++
 1 files changed, 14 insertions(+)


Index: llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1.373 llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1.374
--- llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1.373	Fri Feb 23 15:45:01 2007
+++ llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp	Sat Feb 24 03:45:44 2007
@@ -2101,6 +2101,12 @@
       SDOperand Op = DAG.getNode(ISD::EXCEPTIONADDR, VTs, Ops, 1);
       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));
     }
     return 0;
   }
@@ -2145,6 +2151,12 @@
       SDOperand Op = DAG.getNode(ISD::EHSELECTION, VTs, Ops, 2);
       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));
     }
     
     return 0;
@@ -2169,6 +2181,8 @@
       
       unsigned TypeID = MMI->getTypeIDFor(GV);
       setValue(&I, DAG.getConstant(TypeID, MVT::i32));
+    } else {
+      setValue(&I, DAG.getConstant(0, MVT::i32));
     }
 
     return 0;