Changes in directory llvm/lib/Transforms/Utils:
LoopSimplify.cpp updated: 1.65 -> 1.66
---
Log message:
Fix for my previously reverted patch
---
Diffs of the changes: (+12 -6)
LoopSimplify.cpp | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
Index: llvm/lib/Transforms/Utils/LoopSimplify.cpp
diff -u llvm/lib/Transforms/Utils/LoopSimplify.cpp:1.65
llvm/lib/Transforms/Utils/LoopSimplify.cpp:1.66
--- llvm/lib/Transforms/Utils/LoopSimplify.cpp:1.65 Sat Feb 11 02:47:47 2006
+++ llvm/lib/Transforms/Utils/LoopSimplify.cpp Sat Feb 11 15:24:54 2006
@@ -156,12 +156,18 @@
// 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 @@
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;
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
