Fix an oversight in isPotentiallyReachable where we wouldn't do any CFG-walking
to find loops if the From and To instructions were in the same block.
Refactor the code a little now that we need to fill to start the CFG-walking
algorithm with more than one starting basic block sometimes.
Special thanks to Andrew Trick for catching an error in my understanding of
natural loops in code review.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@188236 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/CFG.cpp b/lib/Analysis/CFG.cpp
index a5ed21a..be7e9fc 100644
--- a/lib/Analysis/CFG.cpp
+++ b/lib/Analysis/CFG.cpp
@@ -133,53 +133,9 @@
return L1 != NULL && L1 == L2;
}
-static bool isPotentiallyReachableSameBlock(const Instruction *A,
- const Instruction *B,
- LoopInfo *LI) {
- // The same block case is special because it's the only time we're looking
- // within a single block to see which comes first. Once we start looking at
- // multiple blocks, the first instruction of the block is reachable, so we
- // only need to determine reachability between whole blocks.
-
- const BasicBlock *BB = A->getParent();
- // If the block is in a loop then we can reach any instruction in the block
- // from any other instruction in the block by going around the backedge.
- // Check whether we're in a loop (or aren't sure).
-
- // Can't be in a loop if it's the entry block -- the entry block may not
- // have predecessors.
- bool HasLoop = BB != &BB->getParent()->getEntryBlock();
-
- // Can't be in a loop if LoopInfo doesn't know about it.
- if (LI && HasLoop) {
- HasLoop = LI->getLoopFor(BB) != 0;
- }
- if (HasLoop)
- return true;
-
- // Linear scan, start at 'A', see whether we hit 'B' or the end first.
- for (BasicBlock::const_iterator I = A, E = BB->end(); I != E; ++I) {
- if (&*I == B)
- return true;
- }
- return false;
-}
-
-bool llvm::isPotentiallyReachable(const Instruction *A, const Instruction *B,
- DominatorTree *DT, LoopInfo *LI) {
- assert(A->getParent()->getParent() == B->getParent()->getParent() &&
- "This analysis is function-local!");
-
- const BasicBlock *StopBB = B->getParent();
-
- if (A->getParent() == B->getParent())
- return isPotentiallyReachableSameBlock(A, B, LI);
-
- if (A->getParent() == &A->getParent()->getParent()->getEntryBlock())
- return true;
- if (B->getParent() == &A->getParent()->getParent()->getEntryBlock())
- return false;
-
+static bool isPotentiallyReachableInner(SmallVectorImpl<BasicBlock *> &Worklist,
+ BasicBlock *StopBB,
+ DominatorTree *DT, LoopInfo *LI) {
// When the stop block is unreachable, it's dominated from everywhere,
// regardless of whether there's a path between the two blocks.
if (DT && !DT->isReachableFromEntry(StopBB))
@@ -188,11 +144,7 @@
// Limit the number of blocks we visit. The goal is to avoid run-away compile
// times on large CFGs without hampering sensible code. Arbitrarily chosen.
unsigned Limit = 32;
-
SmallSet<const BasicBlock*, 64> Visited;
- SmallVector<BasicBlock*, 32> Worklist;
- Worklist.push_back(const_cast<BasicBlock*>(A->getParent()));
-
do {
BasicBlock *BB = Worklist.pop_back_val();
if (!Visited.insert(BB))
@@ -221,7 +173,72 @@
}
} while (!Worklist.empty());
- // We have exhaustived all possible paths and are certain that 'To' can not
- // be reached from 'From'.
+ // We have exhausted all possible paths and are certain that 'To' can not be
+ // reached from 'From'.
return false;
}
+
+bool llvm::isPotentiallyReachable(const BasicBlock *A, const BasicBlock *B,
+ DominatorTree *DT, LoopInfo *LI) {
+ assert(A->getParent() == B->getParent() &&
+ "This analysis is function-local!");
+
+ SmallVector<BasicBlock*, 32> Worklist;
+ Worklist.push_back(const_cast<BasicBlock*>(A));
+
+ return isPotentiallyReachableInner(Worklist, const_cast<BasicBlock*>(B),
+ DT, LI);
+}
+
+bool llvm::isPotentiallyReachable(const Instruction *A, const Instruction *B,
+ DominatorTree *DT, LoopInfo *LI) {
+ assert(A->getParent()->getParent() == B->getParent()->getParent() &&
+ "This analysis is function-local!");
+
+ SmallVector<BasicBlock*, 32> Worklist;
+
+ if (A->getParent() == B->getParent()) {
+ // The same block case is special because it's the only time we're looking
+ // within a single block to see which instruction comes first. Once we
+ // start looking at multiple blocks, the first instruction of the block is
+ // reachable, so we only need to determine reachability between whole
+ // blocks.
+ BasicBlock *BB = const_cast<BasicBlock *>(A->getParent());
+
+ // If the block is in a loop then we can reach any instruction in the block
+ // from any other instruction in the block by going around a backedge.
+ if (LI && LI->getLoopFor(BB) != 0)
+ return true;
+
+ // Linear scan, start at 'A', see whether we hit 'B' or the end first.
+ for (BasicBlock::const_iterator I = A, E = BB->end(); I != E; ++I) {
+ if (&*I == B)
+ return true;
+ }
+
+ // Can't be in a loop if it's the entry block -- the entry block may not
+ // have predecessors.
+ if (BB == &BB->getParent()->getEntryBlock())
+ return false;
+
+ // Otherwise, continue doing the normal per-BB CFG walk.
+ for (succ_iterator I = succ_begin(BB), E = succ_end(BB); I != E; ++I)
+ Worklist.push_back(*I);
+
+ if (Worklist.empty()) {
+ // We've proven that there's no path!
+ return false;
+ }
+ } else {
+ Worklist.push_back(const_cast<BasicBlock*>(A->getParent()));
+ }
+
+ if (A->getParent() == &A->getParent()->getParent()->getEntryBlock())
+ return true;
+ if (B->getParent() == &A->getParent()->getParent()->getEntryBlock())
+ return false;
+
+ return isPotentiallyReachableInner(Worklist,
+ const_cast<BasicBlock*>(B->getParent()),
+ DT, LI);
+}