aboutsummaryrefslogtreecommitdiff
path: root/llvm/lib/Analysis/LoopInfo.cpp
diff options
context:
space:
mode:
authorDavid Majnemer <david.majnemer@gmail.com>2016-05-03 03:57:40 +0000
committerDavid Majnemer <david.majnemer@gmail.com>2016-05-03 03:57:40 +0000
commit3d90bb79c4e81dfd76afe26a771097dc3852674c (patch)
treed3dc2a6f76ce26012d6976cc9618d9df5afbca2c /llvm/lib/Analysis/LoopInfo.cpp
parent2a4c00f24328cece37ee57134974b24e4295a17e (diff)
downloadllvm-3d90bb79c4e81dfd76afe26a771097dc3852674c.zip
llvm-3d90bb79c4e81dfd76afe26a771097dc3852674c.tar.gz
llvm-3d90bb79c4e81dfd76afe26a771097dc3852674c.tar.bz2
[LoopUnroll] Unroll loops which have exit blocks to EH pads
We were overly cautious in our analysis of loops which have invokes which unwind to EH pads. The loop unroll transform is safe because it only clones blocks in the loop body, it does not try to split critical edges involving EH pads. Instead, move the necessary safety check to LoopUnswitch. N.B. The safety check for loop unswitch is covered by an existing test which fails without it. llvm-svn: 268357
Diffstat (limited to 'llvm/lib/Analysis/LoopInfo.cpp')
-rw-r--r--llvm/lib/Analysis/LoopInfo.cpp19
1 files changed, 3 insertions, 16 deletions
diff --git a/llvm/lib/Analysis/LoopInfo.cpp b/llvm/lib/Analysis/LoopInfo.cpp
index 277bd0d..2ac1ae2 100644
--- a/llvm/lib/Analysis/LoopInfo.cpp
+++ b/llvm/lib/Analysis/LoopInfo.cpp
@@ -195,23 +195,10 @@ bool Loop::isSafeToClone() const {
if (isa<IndirectBrInst>(BB->getTerminator()))
return false;
- if (const InvokeInst *II = dyn_cast<InvokeInst>(BB->getTerminator())) {
- if (II->cannotDuplicate())
- return false;
- // Return false if any loop blocks contain invokes to EH-pads other than
- // landingpads; we don't know how to split those edges yet.
- auto *FirstNonPHI = II->getUnwindDest()->getFirstNonPHI();
- if (FirstNonPHI->isEHPad() && !isa<LandingPadInst>(FirstNonPHI))
- return false;
- }
- for (Instruction &I : *BB) {
- if (const CallInst *CI = dyn_cast<CallInst>(&I)) {
- if (CI->cannotDuplicate())
+ for (Instruction &I : *BB)
+ if (auto CS = CallSite(&I))
+ if (CS.cannotDuplicate())
return false;
- }
- if (I.getType()->isTokenTy() && I.isUsedOutsideOfBlock(BB))
- return false;
- }
}
return true;
}