harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r496297 - /harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeLayoutBottomUp.cpp
Date Mon, 15 Jan 2007 12:39:45 GMT
Author: varlax
Date: Mon Jan 15 04:39:44 2007
New Revision: 496297

URL: http://svn.apache.org/viewvc?view=rev&rev=496297
Log:
Applied HARMONY-2956 [drlvm][jit] segfault with -Xem:server option
Tested on SUSE9

Modified:
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeLayoutBottomUp.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeLayoutBottomUp.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeLayoutBottomUp.cpp?view=diff&rev=496297&r1=496296&r2=496297
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeLayoutBottomUp.cpp
(original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32CodeLayoutBottomUp.cpp
Mon Jan 15 04:39:44 2007
@@ -63,7 +63,8 @@
         const Edges& edges = node->getOutEdges();
         sortedEdges.insert(sortedEdges.end(), edges.begin(), edges.end());
     }
-    std::sort(sortedEdges.begin(), sortedEdges.end(), edge_comparator());
+    //GCC 3.4 passes NULLs to comparator if usual std::sort is used here..
+    std::stable_sort(sortedEdges.begin(), sortedEdges.end(), edge_comparator());
     for(StlVector<Edge*>::const_iterator it = sortedEdges.begin(), itEnd = sortedEdges.end();
it!=itEnd; it++) {
         Edge* edge  = *it;
         layoutEdge(edge);



Mime
View raw message