aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorAndrew Trick <atrick@apple.com>2012-03-20 21:24:52 +0000
committerAndrew Trick <atrick@apple.com>2012-03-20 21:24:52 +0000
commit7edc277f7214837d3b7cc382350ea1eb968d09aa (patch)
tree5da24a29f809e93293d1a83961b92f42a04f45eb /lib
parentcd1142ef7f9ed5a570da8b332ba481061eb6fcb6 (diff)
downloadexternal_llvm-7edc277f7214837d3b7cc382350ea1eb968d09aa.zip
external_llvm-7edc277f7214837d3b7cc382350ea1eb968d09aa.tar.gz
external_llvm-7edc277f7214837d3b7cc382350ea1eb968d09aa.tar.bz2
LoopSimplify bug fix. Handle indirect loop back edges.
Do not call SplitBlockPredecessors on a loop preheader when one of the predecessors is an indirectbr. Otherwise, you will hit this assert: !isa<IndirectBrInst>(Preds[i]->getTerminator()) && "Cannot split an edge from an IndirectBrInst" git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@153134 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r--lib/Transforms/Utils/LoopSimplify.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/Transforms/Utils/LoopSimplify.cpp b/lib/Transforms/Utils/LoopSimplify.cpp
index 1b6a19d..0bc185d 100644
--- a/lib/Transforms/Utils/LoopSimplify.cpp
+++ b/lib/Transforms/Utils/LoopSimplify.cpp
@@ -538,8 +538,7 @@ void LoopSimplify::PlaceSplitBlockCarefully(BasicBlock *NewBB,
///
Loop *LoopSimplify::SeparateNestedLoop(Loop *L, LPPassManager &LPM,
BasicBlock *Preheader) {
- // Don't try to separate loops without a preheader (this excludes
- // loop headers which are targeted by an indirectbr).
+ // Don't try to separate loops without a preheader.
if (!Preheader)
return 0;
@@ -554,11 +553,15 @@ Loop *LoopSimplify::SeparateNestedLoop(Loop *L, LPPassManager &LPM,
// handles the case when a PHI node has multiple instances of itself as
// arguments.
SmallVector<BasicBlock*, 8> OuterLoopPreds;
- for (unsigned i = 0, e = PN->getNumIncomingValues(); i != e; ++i)
+ for (unsigned i = 0, e = PN->getNumIncomingValues(); i != e; ++i) {
if (PN->getIncomingValue(i) != PN ||
- !L->contains(PN->getIncomingBlock(i)))
+ !L->contains(PN->getIncomingBlock(i))) {
+ // We can't split indirectbr edges.
+ if (isa<IndirectBrInst>(PN->getIncomingBlock(i)->getTerminator()))
+ return 0;
OuterLoopPreds.push_back(PN->getIncomingBlock(i));
-
+ }
+ }
DEBUG(dbgs() << "LoopSimplify: Splitting out a new outer loop\n");
// If ScalarEvolution is around and knows anything about values in