Break infinite loop.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@41091 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Transforms/Utils/CloneLoop.cpp b/lib/Transforms/Utils/CloneLoop.cpp
index 02278b6..6e35916 100644
--- a/lib/Transforms/Utils/CloneLoop.cpp
+++ b/lib/Transforms/Utils/CloneLoop.cpp
@@ -84,22 +84,21 @@
}
SmallVector<BasicBlock *, 16> NewBlocks;
- SmallVector<std::pair<Loop *, Loop::iterator>, 8> LoopNest;
- LoopNest.push_back(std::make_pair(OrigL, OrigL->begin()));
-
- Loop *NewLoop = NULL;
- while (!LoopNest.empty()) {
- Loop *L = LoopNest.back().first;
- Loop::iterator SubLoop = LoopNest.back().second;
-
- // Handle sub loops.
- if (SubLoop != L->end()) {
- Loop *SL = *SubLoop;
- LoopNest.push_back(std::make_pair(SL, SL->begin()));
- }
+ // Populate loop nest.
+ SmallVector<Loop *, 8> LoopNest;
+ LoopNest.push_back(OrigL);
+
+
+ Loop *NewParentLoop = NULL;
+ while (!LoopNest.empty()) {
+ Loop *L = LoopNest.back();
LoopNest.pop_back();
- NewLoop = new Loop();
+ Loop *NewLoop = new Loop();
+
+ if (!NewParentLoop)
+ NewParentLoop = NewLoop;
+
LPM->insertLoop(NewLoop, L->getParentLoop());
// Clone Basic Blocks.
@@ -122,6 +121,9 @@
CloneDominatorInfo(BB, ValueMap, DT, DF);
}
+ // Process sub loops
+ for (Loop::iterator I = L->begin(), E = L->end(); I != E; ++I)
+ LoopNest.push_back(*I);
}
// Remap instructions to reference operands from ValueMap.
@@ -145,5 +147,5 @@
Function *F = Latch->getParent();
F->getBasicBlockList().insert(Latch, NewBlocks.begin(), NewBlocks.end());
- return NewLoop;
+ return NewParentLoop;
}