aboutsummaryrefslogtreecommitdiff
path: root/lib/Analysis/LoopInfo.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'lib/Analysis/LoopInfo.cpp')
-rw-r--r--lib/Analysis/LoopInfo.cpp24
1 files changed, 13 insertions, 11 deletions
diff --git a/lib/Analysis/LoopInfo.cpp b/lib/Analysis/LoopInfo.cpp
index ef4b6430ba..70bf97cacc 100644
--- a/lib/Analysis/LoopInfo.cpp
+++ b/lib/Analysis/LoopInfo.cpp
@@ -155,17 +155,19 @@ Loop *LoopInfo::ConsiderForLoop(BasicBlock *BB, const DominatorSet &DS) {
// now by moving the loop into the correct subloop.
//
Loop *SubLoop = BBMI->second;
- Loop *OldSubLoopParent = SubLoop->getParentLoop();
- if (OldSubLoopParent != L) {
- // Remove SubLoop from OldSubLoopParent's list of subloops...
- std::vector<Loop*>::iterator I =
- std::find(OldSubLoopParent->SubLoops.begin(),
- OldSubLoopParent->SubLoops.end(), SubLoop);
- assert(I != OldSubLoopParent->SubLoops.end()
- && "Loop parent doesn't contain loop?");
- OldSubLoopParent->SubLoops.erase(I);
- SubLoop->ParentLoop = L;
- L->SubLoops.push_back(SubLoop);
+ if (SubLoop->getHeader() == *I) { // Only do this once for the loop...
+ Loop *OldSubLoopParent = SubLoop->getParentLoop();
+ if (OldSubLoopParent != L) {
+ // Remove SubLoop from OldSubLoopParent's list of subloops...
+ std::vector<Loop*>::iterator I =
+ std::find(OldSubLoopParent->SubLoops.begin(),
+ OldSubLoopParent->SubLoops.end(), SubLoop);
+ assert(I != OldSubLoopParent->SubLoops.end()
+ && "Loop parent doesn't contain loop?");
+ OldSubLoopParent->SubLoops.erase(I);
+ SubLoop->ParentLoop = L;
+ L->SubLoops.push_back(SubLoop);
+ }
}
}
}