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

[Jim Laskey]

Changes in directory llvm/lib/CodeGen/SelectionDAG:

DAGCombiner.cpp updated: 1.100 -> 1.101
LegalizeDAG.cpp updated: 1.303 -> 1.304
---
Log message:

Should not combine ISD::LOCATIONs until we have scheme to remove from
MachineDebugInfo tables.


---
Diffs of the changes:  (+2 -36)

 DAGCombiner.cpp |   34 ----------------------------------
 LegalizeDAG.cpp |    4 ++--
 2 files changed, 2 insertions(+), 36 deletions(-)


Index: llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp:1.100 llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp:1.101
--- llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp:1.100	Tue Feb  7 20:13:15 2006
+++ llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp	Wed Feb 15 13:34:44 2006
@@ -175,9 +175,6 @@
     SDOperand visitLOAD(SDNode *N);
     SDOperand visitSTORE(SDNode *N);
 
-    SDOperand visitLOCATION(SDNode *N);
-    SDOperand visitDEBUGLOC(SDNode *N);
-
     SDOperand ReassociateOps(unsigned Opc, SDOperand LHS, SDOperand RHS);
     
     bool SimplifySelectOps(SDNode *SELECT, SDOperand LHS, SDOperand RHS);
@@ -568,8 +565,6 @@
   case ISD::BRTWOWAY_CC:        return visitBRTWOWAY_CC(N);
   case ISD::LOAD:               return visitLOAD(N);
   case ISD::STORE:              return visitSTORE(N);
-  case ISD::LOCATION:           return visitLOCATION(N);
-  case ISD::DEBUG_LOC:          return visitDEBUGLOC(N);
   }
   return SDOperand();
 }
@@ -2162,35 +2157,6 @@
   return SDOperand();
 }
 
-SDOperand DAGCombiner::visitLOCATION(SDNode *N) {
-  SDOperand Chain    = N->getOperand(0);
-  
-  // Remove redundant locations (last one holds)
-  if (Chain.getOpcode() == ISD::LOCATION && Chain.hasOneUse()) {
-    return DAG.getNode(ISD::LOCATION, MVT::Other, Chain.getOperand(0),
-                                                  N->getOperand(1),
-                                                  N->getOperand(2),
-                                                  N->getOperand(3),
-                                                  N->getOperand(4));
-  }
-  
-  return SDOperand();
-}
-
-SDOperand DAGCombiner::visitDEBUGLOC(SDNode *N) {
-  SDOperand Chain    = N->getOperand(0);
-  
-  // Remove redundant debug locations (last one holds)
-  if (Chain.getOpcode() == ISD::DEBUG_LOC && Chain.hasOneUse()) {
-    return DAG.getNode(ISD::DEBUG_LOC, MVT::Other, Chain.getOperand(0),
-                                                   N->getOperand(1),
-                                                   N->getOperand(2),
-                                                   N->getOperand(3));
-  }
-  
-  return SDOperand();
-}
-
 SDOperand DAGCombiner::SimplifySelect(SDOperand N0, SDOperand N1, SDOperand N2){
   assert(N0.getOpcode() ==ISD::SETCC && "First argument must be a SetCC node!");
   


Index: llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp:1.303 llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp:1.304
--- llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp:1.303	Mon Feb 13 18:55:02 2006
+++ llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp	Wed Feb 15 13:34:44 2006
@@ -519,8 +519,8 @@
           Ops.push_back(DAG.getConstant(SrcFile, MVT::i32));  // source file id
           Result = DAG.getNode(ISD::DEBUG_LOC, MVT::Other, Ops);
         } else {
-          unsigned Line = dyn_cast<ConstantSDNode>(LineOp)->getValue();
-          unsigned Col = dyn_cast<ConstantSDNode>(ColOp)->getValue();
+          unsigned Line = cast<ConstantSDNode>(LineOp)->getValue();
+          unsigned Col = cast<ConstantSDNode>(ColOp)->getValue();
           unsigned ID = DebugInfo->RecordLabel(Line, Col, SrcFile);
           Ops.push_back(DAG.getConstant(ID, MVT::i32));
           Result = DAG.getNode(ISD::DEBUG_LABEL, MVT::Other, Ops);