[llvm-commits] [llvm] r38516 - /llvm/trunk/lib/CodeGen/BranchFolding.cpp

[David Greene]

Author: greened
Date: Tue Jul 10 17:00:30 2007
New Revision: 38516

URL: http://llvm.org/viewvc/llvm-project?rev=38516&view=rev
Log:
Make this work with GLIBCXX_DEBUG.


Modified:
    llvm/trunk/lib/CodeGen/BranchFolding.cpp

Modified: llvm/trunk/lib/CodeGen/BranchFolding.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/BranchFolding.cpp?rev=38516&r1=38515&r2=38516&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/BranchFolding.cpp (original)
+++ llvm/trunk/lib/CodeGen/BranchFolding.cpp Tue Jul 10 17:00:30 2007
@@ -429,8 +429,15 @@
       return true;
     else if (p.second->getNumber() > q.second->getNumber())
       return false;
-    else
+    else {
+      // _GLIBCXX_DEBUG needs to check strict weak ordering and it
+      // does it by doing a compare on the same object.
+#ifdef _GLIBCXX_DEBUG
+      return(false);
+#else
       assert(0 && "Predecessor appears twice");
+#endif
+    }
 }
 
 // See if any of the blocks in MergePotentials (which all have a common single