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

[Jim Laskey]

Changes in directory llvm/lib/CodeGen/SelectionDAG:

ScheduleDAG.cpp updated: 1.48 -> 1.49
---
Log message:

Groups were not emitted if the dominator node and the node in the ordering list
were not the same node.  Ultimately the test was bogus.



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

 ScheduleDAG.cpp |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)


Index: llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp:1.48 llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp:1.49
--- llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp:1.48	Sat Dec 17 19:03:46 2005
+++ llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp	Sat Dec 17 21:59:21 2005
@@ -653,10 +653,10 @@
 /// IncludeNode - Add node to NodeInfo vector.
 ///
 void SimpleSched::IncludeNode(NodeInfo *NI) {
-// Get node
-SDNode *Node = NI->Node;
-// Ignore entry node
-if (Node->getOpcode() == ISD::EntryToken) return;
+  // Get node
+  SDNode *Node = NI->Node;
+  // Ignore entry node
+  if (Node->getOpcode() == ISD::EntryToken) return;
   // Check current count for node
   int Count = NI->getPending();
   // If the node is already in list
@@ -987,13 +987,9 @@
   for (unsigned i = 0, N = Ordering.size(); i < N; i++) {
     // Get the scheduling info
     NodeInfo *NI = Ordering[i];
-    // Iterate through nodes
-    NodeGroupIterator NGI(Ordering[i]);
     if (NI->isInGroup()) {
-      if (NI->isGroupDominator()) {
-        NodeGroupIterator NGI(Ordering[i]);
-        while (NodeInfo *NI = NGI.next()) EmitNode(NI);
-      }
+      NodeGroupIterator NGI(Ordering[i]);
+      while (NodeInfo *NI = NGI.next()) EmitNode(NI);
     } else {
       EmitNode(NI);
     }