projects
/
oota-llvm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8202010
)
Make this work with GLIBCXX_DEBUG.
author
David Greene
<greened@obbligato.org>
Tue, 10 Jul 2007 22:00:30 +0000
(22:00 +0000)
committer
David Greene
<greened@obbligato.org>
Tue, 10 Jul 2007 22:00:30 +0000
(22:00 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@38516
91177308
-0d34-0410-b5e6-
96231b3b80d8
lib/CodeGen/BranchFolding.cpp
patch
|
blob
|
history
diff --git
a/lib/CodeGen/BranchFolding.cpp
b/lib/CodeGen/BranchFolding.cpp
index d0dcc708d065f075a7e3b6aae338476b9e6b04ce..431bc4eca35c802415ed794632fee86858dedbb9 100644
(file)
--- a/
lib/CodeGen/BranchFolding.cpp
+++ b/
lib/CodeGen/BranchFolding.cpp
@@
-429,8
+429,15
@@
static bool MergeCompare(const std::pair<unsigned,MachineBasicBlock*> &p,
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