[llvm-commits] [llvm] r66749 - /llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp
Dale Johannesen
dalej at apple.com
Wed Mar 11 18:00:26 PDT 2009
Author: johannes
Date: Wed Mar 11 20:00:26 2009
New Revision: 66749
URL: http://llvm.org/viewvc/llvm-project?rev=66749&view=rev
Log:
Fix some nondeterministic behavior when forwarding
from a switch table. Multiple table entries that
branch to the same place were being sorted by the
pointer value of the ConstantInt*; changed to sort
by the actual value of the ConstantInt.
Modified:
llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp
Modified: llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp?rev=66749&r1=66748&r2=66749&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp (original)
+++ llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp Wed Mar 11 20:00:26 2009
@@ -719,6 +719,16 @@
return false;
}
+/// A sorting function for the std::set's in the following function which track
+/// the values in switches. This forces deterministic behavior by comparing
+/// the values rather than the pointers.
+class Sorter {
+public:
+ bool operator() (ConstantInt * const &p, ConstantInt * const &q) const {
+ return p->getSExtValue() < q->getSExtValue();
+ }
+};
+
/// FoldValueComparisonIntoPredecessors - The specified terminator is a value
/// equality comparison instruction (either a switch or a branch on "X == c").
/// See if any of the predecessors of the terminator block are value comparisons
@@ -754,7 +764,7 @@
if (PredDefault == BB) {
// If this is the default destination from PTI, only the edges in TI
// that don't occur in PTI, or that branch to BB will be activated.
- std::set<ConstantInt*> PTIHandled;
+ std::set<ConstantInt*, Sorter> PTIHandled;
for (unsigned i = 0, e = PredCases.size(); i != e; ++i)
if (PredCases[i].second != BB)
PTIHandled.insert(PredCases[i].first);
@@ -782,7 +792,7 @@
// If this is not the default destination from PSI, only the edges
// in SI that occur in PSI with a destination of BB will be
// activated.
- std::set<ConstantInt*> PTIHandled;
+ std::set<ConstantInt*, Sorter> PTIHandled;
for (unsigned i = 0, e = PredCases.size(); i != e; ++i)
if (PredCases[i].second == BB) {
PTIHandled.insert(PredCases[i].first);
@@ -803,7 +813,7 @@
// If there are any constants vectored to BB that TI doesn't handle,
// they must go to the default destination of TI.
- for (std::set<ConstantInt*>::iterator I = PTIHandled.begin(),
+ for (std::set<ConstantInt*, Sorter>::iterator I = PTIHandled.begin(),
E = PTIHandled.end(); I != E; ++I) {
PredCases.push_back(std::make_pair(*I, BBDefault));
NewSuccessors.push_back(BBDefault);
More information about the llvm-commits
mailing list