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

[Jim Laskey]

Changes in directory llvm/lib/CodeGen/SelectionDAG:

LegalizeDAG.cpp updated: 1.457 -> 1.458
ScheduleDAG.cpp updated: 1.116 -> 1.117
SelectionDAG.cpp updated: 1.377 -> 1.378
SelectionDAGISel.cpp updated: 1.344 -> 1.345
---
Log message:

Make LABEL a builtin opcode.

---
Diffs of the changes:  (+11 -10)

 LegalizeDAG.cpp      |   12 ++++++------
 ScheduleDAG.cpp      |    1 +
 SelectionDAG.cpp     |    2 +-
 SelectionDAGISel.cpp |    6 +++---
 4 files changed, 11 insertions(+), 10 deletions(-)


Index: llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp:1.457 llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp:1.458
--- llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp:1.457	Sat Jan 20 16:35:55 2007
+++ llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp	Fri Jan 26 08:34:51 2007
@@ -737,9 +737,9 @@
     case TargetLowering::Expand: {
       MachineDebugInfo *DebugInfo = DAG.getMachineDebugInfo();
       bool useDEBUG_LOC = TLI.isOperationLegal(ISD::DEBUG_LOC, MVT::Other);
-      bool useDEBUG_LABEL = TLI.isOperationLegal(ISD::DEBUG_LABEL, MVT::Other);
+      bool useLABEL = TLI.isOperationLegal(ISD::LABEL, MVT::Other);
       
-      if (DebugInfo && (useDEBUG_LOC || useDEBUG_LABEL)) {
+      if (DebugInfo && (useDEBUG_LOC || useLABEL)) {
         const std::string &FName =
           cast<StringSDNode>(Node->getOperand(3))->getValue();
         const std::string &DirName = 
@@ -761,7 +761,7 @@
           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[0],Ops.size());
+          Result = DAG.getNode(ISD::LABEL, MVT::Other,&Ops[0],Ops.size());
         }
       } else {
         Result = Tmp1;  // chain
@@ -803,9 +803,9 @@
     }
     break;    
 
-  case ISD::DEBUG_LABEL:
-    assert(Node->getNumOperands() == 2 && "Invalid DEBUG_LABEL node!");
-    switch (TLI.getOperationAction(ISD::DEBUG_LABEL, MVT::Other)) {
+  case ISD::LABEL:
+    assert(Node->getNumOperands() == 2 && "Invalid LABEL node!");
+    switch (TLI.getOperationAction(ISD::LABEL, MVT::Other)) {
     default: assert(0 && "This action is not supported yet!");
     case TargetLowering::Legal:
       Tmp1 = LegalizeOp(Node->getOperand(0));  // Legalize the chain.


Index: llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp:1.116 llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp:1.117
--- llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp:1.116	Wed Jan 24 01:03:39 2007
+++ llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp	Fri Jan 26 08:34:51 2007
@@ -452,6 +452,7 @@
       assert(0 && "This target-independent node should have been selected!");
     case ISD::EntryToken: // fall thru
     case ISD::TokenFactor:
+    case ISD::LABEL:
       break;
     case ISD::CopyToReg: {
       unsigned InReg;


Index: llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp:1.377 llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp:1.378
--- llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp:1.377	Thu Dec  7 14:28:15 2006
+++ llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp	Fri Jan 26 08:34:51 2007
@@ -2691,6 +2691,7 @@
   case ISD::UNDEF:         return "undef";
   case ISD::MERGE_VALUES:  return "mergevalues";
   case ISD::INLINEASM:     return "inlineasm";
+  case ISD::LABEL:         return "label";
   case ISD::HANDLENODE:    return "handlenode";
   case ISD::FORMAL_ARGUMENTS: return "formal_arguments";
   case ISD::CALL:          return "call";
@@ -2811,7 +2812,6 @@
   // Debug info
   case ISD::LOCATION: return "location";
   case ISD::DEBUG_LOC: return "debug_loc";
-  case ISD::DEBUG_LABEL: return "debug_label";
 
   case ISD::CONDCODE:
     switch (cast<CondCodeSDNode>(this)->get()) {


Index: llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1.344 llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1.345
--- llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1.344	Sat Jan 20 18:29:25 2007
+++ llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp	Fri Jan 26 08:34:51 2007
@@ -1980,7 +1980,7 @@
     DbgRegionStartInst &RSI = cast<DbgRegionStartInst>(I);
     if (DebugInfo && RSI.getContext() && DebugInfo->Verify(RSI.getContext())) {
       unsigned LabelID = DebugInfo->RecordRegionStart(RSI.getContext());
-      DAG.setRoot(DAG.getNode(ISD::DEBUG_LABEL, MVT::Other, getRoot(),
+      DAG.setRoot(DAG.getNode(ISD::LABEL, MVT::Other, getRoot(),
                               DAG.getConstant(LabelID, MVT::i32)));
     }
 
@@ -1991,7 +1991,7 @@
     DbgRegionEndInst &REI = cast<DbgRegionEndInst>(I);
     if (DebugInfo && REI.getContext() && DebugInfo->Verify(REI.getContext())) {
       unsigned LabelID = DebugInfo->RecordRegionEnd(REI.getContext());
-      DAG.setRoot(DAG.getNode(ISD::DEBUG_LABEL, MVT::Other,
+      DAG.setRoot(DAG.getNode(ISD::LABEL, MVT::Other,
                               getRoot(), DAG.getConstant(LabelID, MVT::i32)));
     }
 
@@ -2003,7 +2003,7 @@
     if (DebugInfo && FSI.getSubprogram() &&
         DebugInfo->Verify(FSI.getSubprogram())) {
       unsigned LabelID = DebugInfo->RecordRegionStart(FSI.getSubprogram());
-      DAG.setRoot(DAG.getNode(ISD::DEBUG_LABEL, MVT::Other,
+      DAG.setRoot(DAG.getNode(ISD::LABEL, MVT::Other,
                   getRoot(), DAG.getConstant(LabelID, MVT::i32)));
     }