Bug fix: nextToTry was not being initialized in one case.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@1974 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/InstrSched/SchedPriorities.cpp b/lib/CodeGen/InstrSched/SchedPriorities.cpp
index ef9f9e459972bb2b01c3f2ce341926fd18a872fc..810692f7ba0584c40c452d5f1b8dfcc7c52c540c 100644 (file)
--- a/lib/CodeGen/InstrSched/SchedPriorities.cpp
+++ b/lib/CodeGen/InstrSched/SchedPriorities.cpp
@@ -89,6 +89,8 @@ SchedPriorities::initializeReadyHeap(const SchedGraph* graph)
   
   candsAsHeap.makeHeap();
   
+  nextToTry = candsAsHeap.begin();
+  
 #ifdef TEST_HEAP_CONVERSION
   cerr << "After heap conversion:\n";
   copy(candsAsHeap.begin(), candsAsHeap.end(),
@@ -107,9 +109,9 @@ SchedPriorities::insertReady(const SchedGraphNode* node)
   
   if (SchedDebugLevel >= Sched_PrintSchedTrace)
     {
-      cerr << "    Cycle " << (long)getTime() << ": "
-          << " Node " << node->getNodeId() << " is ready; "
-          << " Delay = " << (long)getNodeDelayRef(node) << "; Instruction: \n";
+      cerr << " Node " << node->getNodeId() << " will be ready in Cycle "
+           << earliestForNode[node->getNodeId()] << "; "
+          << " Delay = " <<(long)getNodeDelayRef(node) << "; Instruction: \n";
       cerr << "        " << *node->getMachineInstr() << "\n";
     }
 }

diff --git a/lib/Target/SparcV9/InstrSched/SchedPriorities.cpp b/lib/Target/SparcV9/InstrSched/SchedPriorities.cpp
index ef9f9e459972bb2b01c3f2ce341926fd18a872fc..810692f7ba0584c40c452d5f1b8dfcc7c52c540c 100644 (file)
--- a/lib/Target/SparcV9/InstrSched/SchedPriorities.cpp
+++ b/lib/Target/SparcV9/InstrSched/SchedPriorities.cpp
@@ -89,6 +89,8 @@ SchedPriorities::initializeReadyHeap(const SchedGraph* graph)
   
   candsAsHeap.makeHeap();
   
+  nextToTry = candsAsHeap.begin();
+  
 #ifdef TEST_HEAP_CONVERSION
   cerr << "After heap conversion:\n";
   copy(candsAsHeap.begin(), candsAsHeap.end(),
@@ -107,9 +109,9 @@ SchedPriorities::insertReady(const SchedGraphNode* node)
   
   if (SchedDebugLevel >= Sched_PrintSchedTrace)
     {
-      cerr << "    Cycle " << (long)getTime() << ": "
-          << " Node " << node->getNodeId() << " is ready; "
-          << " Delay = " << (long)getNodeDelayRef(node) << "; Instruction: \n";
+      cerr << " Node " << node->getNodeId() << " will be ready in Cycle "
+           << earliestForNode[node->getNodeId()] << "; "
+          << " Delay = " <<(long)getNodeDelayRef(node) << "; Instruction: \n";
       cerr << "        " << *node->getMachineInstr() << "\n";
     }
 }