misched: Recompute priority queue when DFSResults are updated.
authorBenjamin Kramer <benny.kra@googlemail.com>
Thu, 29 Nov 2012 14:36:26 +0000 (14:36 +0000)
committerBenjamin Kramer <benny.kra@googlemail.com>
Thu, 29 Nov 2012 14:36:26 +0000 (14:36 +0000)
This was found by MSVC10's STL debug mode on a test from the test suite. Sadly
std::is_heap isn't standard so there is no way to assert this without writing
our own heap verify, which looks like overkill to me.

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

lib/CodeGen/MachineScheduler.cpp

index e27bb0dd1bd22d18c975aad458efd53ff94a7bf9..b3e38f64ff09cc46e818d23ca71704fa9ec40197 100644 (file)
@@ -2117,6 +2117,8 @@ public:
   virtual void registerRoots() {
     DFSResult.compute(ReadyQ);
     ScheduledTrees.resize(DFSResult.getNumSubtrees());
+    // Restore the heap in ReadyQ with the updated DFS results.
+    std::make_heap(ReadyQ.begin(), ReadyQ.end(), Cmp);
   }
 
   /// Implement MachineSchedStrategy interface.