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

[Jim Laskey]

Changes in directory llvm/lib/CodeGen/SelectionDAG:

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

Fix a bug Sabre was having where the DAG root was a group.  The group dominator
needed to be added to the ordering list, not the first member of the group.


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

 ScheduleDAG.cpp |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)


Index: llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp:1.49 llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp:1.50
--- llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp:1.49	Sat Dec 17 21:59:21 2005
+++ llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp	Sat Dec 17 22:40:52 2005
@@ -682,7 +682,12 @@
 /// Note that the ordering in the Nodes vector is reversed.
 void SimpleSched::VisitAll() {
   // Add first element to list
-  Ordering.push_back(getNI(DAG.getRoot().Val));
+  NodeInfo *NI = getNI(DAG.getRoot().Val);
+  if (NI->isInGroup()) {
+    Ordering.push_back(NI->Group->getDominator());
+  } else {
+    Ordering.push_back(NI);
+  }
   
   // Iterate through all nodes that have been added
   for (unsigned i = 0; i < Ordering.size(); i++) { // note: size() varies