Fix for my previously reverted patch

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@26126 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2006-02-11 21:24:54 +00:00
parent 539c337148
commit d308ddcd67

View File

@ -156,12 +156,18 @@ bool LoopSimplify::ProcessLoop(Loop *L) {
// Next, check to make sure that all exit nodes of the loop only have
// predecessors that are inside of the loop. This check guarantees that the
// loop preheader/header will dominate the exit blocks. If the exit block has
// predecessors from outside of the loop, split the edge now.
std::vector<BasicBlock*> ExitBlocks;
L->getExitBlocks(ExitBlocks);
SetVector<BasicBlock*> ExitBlockSet(ExitBlocks.begin(), ExitBlocks.end());
// predecessors from outside of the loop, split the edge now. Note that we
// only want to consider the exit blocks of *this* loop, not of any subloops,
// so we can't use Loop::getExitBlocks().
LoopInfo &LI = getAnalysis<LoopInfo>();
SetVector<BasicBlock*> ExitBlockSet;
for (Loop::block_iterator BI = L->block_begin(),
BE = L->block_end(); BI != BE; ++BI)
if (LI.getLoopFor(*BI) == L) // not a subloop.
for (succ_iterator I = succ_begin(*BI), E = succ_end(*BI); I != E; ++I)
if (!L->contains(*I)) // Not in current loop?
ExitBlockSet.insert(*I); // It must be an exit block.
for (SetVector<BasicBlock*>::iterator I = ExitBlockSet.begin(),
E = ExitBlockSet.end(); I != E; ++I) {
BasicBlock *ExitBlock = *I;
@ -169,7 +175,7 @@ bool LoopSimplify::ProcessLoop(Loop *L) {
PI != PE; ++PI)
// Must be exactly this loop: no subloops, parent loops, or non-loop preds
// allowed.
if (!L->contains(*PI)) {
if (LI.getLoopFor(*PI) != L) {
RewriteLoopExitBlock(L, ExitBlock);
NumInserted++;
Changed = true;