summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Transforms/IPO/LoopExtractor.cpp
diff options
context:
space:
mode:
authorBill Wendling <isanbard@gmail.com>2011-09-20 22:23:09 +0000
committerBill Wendling <isanbard@gmail.com>2011-09-20 22:23:09 +0000
commit0058520770010e57760b557f3fb1ae5e059dc9b4 (patch)
tree096b6cb86aff4701a425afea6025a4d82c4ab491 /llvm/lib/Transforms/IPO/LoopExtractor.cpp
parent7c2b28a16f0eb745aad265eb5de751483b5cd24c (diff)
downloadbcm5719-llvm-0058520770010e57760b557f3fb1ae5e059dc9b4.tar.gz
bcm5719-llvm-0058520770010e57760b557f3fb1ae5e059dc9b4.zip
Omit extracting a loop if one of the exits is a landing pad.
The landing pad must accompany the invoke when it's extracted. However, if it does, then the loop isn't properly extracted. I.e., the resulting extraction has a loop in it. The extracted function is then extracted, etc. resulting in an infinite loop. llvm-svn: 140193
Diffstat (limited to 'llvm/lib/Transforms/IPO/LoopExtractor.cpp')
-rw-r--r--llvm/lib/Transforms/IPO/LoopExtractor.cpp16
1 files changed, 11 insertions, 5 deletions
diff --git a/llvm/lib/Transforms/IPO/LoopExtractor.cpp b/llvm/lib/Transforms/IPO/LoopExtractor.cpp
index 714282b2b5e..826ade38d1e 100644
--- a/llvm/lib/Transforms/IPO/LoopExtractor.cpp
+++ b/llvm/lib/Transforms/IPO/LoopExtractor.cpp
@@ -101,18 +101,24 @@ bool LoopExtractor::runOnLoop(Loop *L, LPPassManager &LPM) {
L->getHeader()->getParent()->getEntryBlock().getTerminator();
if (!isa<BranchInst>(EntryTI) ||
!cast<BranchInst>(EntryTI)->isUnconditional() ||
- EntryTI->getSuccessor(0) != L->getHeader())
+ EntryTI->getSuccessor(0) != L->getHeader()) {
ShouldExtractLoop = true;
- else {
+ } else {
// Check to see if any exits from the loop are more than just return
- // blocks.
+ // blocks. We also must omit landing pads. Landing pads must accompany the
+ // invoke instruction. But this would result in a loop in the extracted
+ // function. An infinite cycle occurs when it tries to extract that loop as
+ // well.
SmallVector<BasicBlock*, 8> ExitBlocks;
L->getExitBlocks(ExitBlocks);
- for (unsigned i = 0, e = ExitBlocks.size(); i != e; ++i)
- if (!isa<ReturnInst>(ExitBlocks[i]->getTerminator())) {
+ for (unsigned i = 0, e = ExitBlocks.size(); i != e; ++i) {
+ if (!isa<ReturnInst>(ExitBlocks[i]->getTerminator()))
ShouldExtractLoop = true;
+ if (ExitBlocks[i]->isLandingPad()) {
+ ShouldExtractLoop = false;
break;
}
+ }
}
if (ShouldExtractLoop) {
if (NumLoops == 0) return Changed;
OpenPOWER on IntegriCloud