diff options
| author | Jakob Stoklund Olesen <stoklund@2pi.dk> | 2011-01-11 22:54:38 +0000 |
|---|---|---|
| committer | Jakob Stoklund Olesen <stoklund@2pi.dk> | 2011-01-11 22:54:38 +0000 |
| commit | fbbd4abfe5a89e432240d2c05201b44a5e2f2f78 (patch) | |
| tree | f786edd3bdfd7dc0cbe86f970a687fdd847bf39c /lib/Transforms/Utils/BasicBlockUtils.cpp | |
| parent | a518ccc26a0e01d93a58e305f7c19c42fa640bb9 (diff) | |
| download | external_llvm-fbbd4abfe5a89e432240d2c05201b44a5e2f2f78.zip external_llvm-fbbd4abfe5a89e432240d2c05201b44a5e2f2f78.tar.gz external_llvm-fbbd4abfe5a89e432240d2c05201b44a5e2f2f78.tar.bz2 | |
Fix a non-deterministic loop in llvm::MergeBlockIntoPredecessor.
DT->changeImmediateDominator() trivially ignores identity updates, so there is
really no need for the uniqueing provided by SmallPtrSet.
I expect this to fix PR8954.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@123286 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Transforms/Utils/BasicBlockUtils.cpp')
| -rw-r--r-- | lib/Transforms/Utils/BasicBlockUtils.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Transforms/Utils/BasicBlockUtils.cpp b/lib/Transforms/Utils/BasicBlockUtils.cpp index e71e84f..c5b9707 100644 --- a/lib/Transforms/Utils/BasicBlockUtils.cpp +++ b/lib/Transforms/Utils/BasicBlockUtils.cpp @@ -169,8 +169,8 @@ bool llvm::MergeBlockIntoPredecessor(BasicBlock *BB, Pass *P) { if (DominatorTree *DT = P->getAnalysisIfAvailable<DominatorTree>()) { if (DomTreeNode *DTN = DT->getNode(BB)) { DomTreeNode *PredDTN = DT->getNode(PredBB); - SmallPtrSet<DomTreeNode*, 8> Children(DTN->begin(), DTN->end()); - for (SmallPtrSet<DomTreeNode*, 8>::iterator DI = Children.begin(), + SmallVector<DomTreeNode*, 8> Children(DTN->begin(), DTN->end()); + for (SmallVector<DomTreeNode*, 8>::iterator DI = Children.begin(), DE = Children.end(); DI != DE; ++DI) DT->changeImmediateDominator(*DI, PredDTN); |