diff options
| author | Michael Zolotukhin <mzolotukhin@apple.com> | 2016-05-26 21:42:51 +0000 |
|---|---|---|
| committer | Michael Zolotukhin <mzolotukhin@apple.com> | 2016-05-26 21:42:51 +0000 |
| commit | 1ecdedad8d839f5522aabbbdf6dd17541f9cf501 (patch) | |
| tree | f890649f2270f2fd88836af2074626f7291c16d0 /llvm/lib/Transforms | |
| parent | 7509d54b216924b592c1752eface9789f683d616 (diff) | |
| download | bcm5719-llvm-1ecdedad8d839f5522aabbbdf6dd17541f9cf501.tar.gz bcm5719-llvm-1ecdedad8d839f5522aabbbdf6dd17541f9cf501.zip | |
[LoopUnrollAnalyzer] Fix a crash in analyzeLoopUnrollCost.
Condition might be simplified to a Constant, but it doesn't have to be
ConstantInt, so we should dyn_cast, instead of cast.
This fixes PR27886.
llvm-svn: 270924
Diffstat (limited to 'llvm/lib/Transforms')
| -rw-r--r-- | llvm/lib/Transforms/Scalar/LoopUnrollPass.cpp | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/llvm/lib/Transforms/Scalar/LoopUnrollPass.cpp b/llvm/lib/Transforms/Scalar/LoopUnrollPass.cpp index 8e65af9559e..b3f138cf731 100644 --- a/llvm/lib/Transforms/Scalar/LoopUnrollPass.cpp +++ b/llvm/lib/Transforms/Scalar/LoopUnrollPass.cpp @@ -464,41 +464,37 @@ analyzeLoopUnrollCost(const Loop *L, unsigned TripCount, DominatorTree &DT, // Add in the live successors by first checking whether we have terminator // that may be simplified based on the values simplified by this call. + BasicBlock *KnownSucc = nullptr; if (BranchInst *BI = dyn_cast<BranchInst>(TI)) { if (BI->isConditional()) { if (Constant *SimpleCond = SimplifiedValues.lookup(BI->getCondition())) { - BasicBlock *Succ = nullptr; // Just take the first successor if condition is undef if (isa<UndefValue>(SimpleCond)) - Succ = BI->getSuccessor(0); - else - Succ = BI->getSuccessor( - cast<ConstantInt>(SimpleCond)->isZero() ? 1 : 0); - if (L->contains(Succ)) - BBWorklist.insert(Succ); - else - ExitWorklist.insert({BB, Succ}); - continue; + KnownSucc = BI->getSuccessor(0); + else if (ConstantInt *SimpleCondVal = + dyn_cast<ConstantInt>(SimpleCond)) + KnownSucc = BI->getSuccessor(SimpleCondVal->isZero() ? 1 : 0); } } } else if (SwitchInst *SI = dyn_cast<SwitchInst>(TI)) { if (Constant *SimpleCond = SimplifiedValues.lookup(SI->getCondition())) { - BasicBlock *Succ = nullptr; // Just take the first successor if condition is undef if (isa<UndefValue>(SimpleCond)) - Succ = SI->getSuccessor(0); - else - Succ = SI->findCaseValue(cast<ConstantInt>(SimpleCond)) - .getCaseSuccessor(); - if (L->contains(Succ)) - BBWorklist.insert(Succ); - else - ExitWorklist.insert({BB, Succ}); - continue; + KnownSucc = SI->getSuccessor(0); + else if (ConstantInt *SimpleCondVal = + dyn_cast<ConstantInt>(SimpleCond)) + KnownSucc = SI->findCaseValue(SimpleCondVal).getCaseSuccessor(); } } + if (KnownSucc) { + if (L->contains(KnownSucc)) + BBWorklist.insert(KnownSucc); + else + ExitWorklist.insert({BB, KnownSucc}); + continue; + } // Add BB's successors to the worklist. for (BasicBlock *Succ : successors(BB)) |

