diff options
Diffstat (limited to 'lib/Analysis/MemoryDependenceAnalysis.cpp')
| -rw-r--r-- | lib/Analysis/MemoryDependenceAnalysis.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/lib/Analysis/MemoryDependenceAnalysis.cpp b/lib/Analysis/MemoryDependenceAnalysis.cpp index ae26c26dad..e260b27164 100644 --- a/lib/Analysis/MemoryDependenceAnalysis.cpp +++ b/lib/Analysis/MemoryDependenceAnalysis.cpp @@ -103,7 +103,8 @@ Instruction* MemoryDependenceAnalysis::getCallSiteDependency(CallSite C, Instruc bool MemoryDependenceAnalysis::nonLocalHelper(Instruction* query, BasicBlock* block, - DenseMap<BasicBlock*, Value*>& resp) { + DenseMap<BasicBlock*, Value*>& resp, + SmallPtrSet<BasicBlock*, 4>& visited) { if (resp.count(block)) return resp[block] != None; @@ -113,10 +114,15 @@ bool MemoryDependenceAnalysis::nonLocalHelper(Instruction* query, return true; } + visited.insert(block); + bool inserted = false; for (pred_iterator PI = pred_begin(block), PE = pred_end(block); PI != PE; ++PI) - inserted |= nonLocalHelper(query, *PI, resp); + if (!visited.count(*PI)) + inserted |= nonLocalHelper(query, *PI, resp, visited); + + visited.erase(block); if (!inserted) resp.insert(std::make_pair(block, None)); @@ -133,11 +139,14 @@ bool MemoryDependenceAnalysis::getNonLocalDependency(Instruction* query, } bool inserted = false; + SmallPtrSet<BasicBlock*, 4> visited; + visited.insert(query->getParent()); BasicBlock* parent = query->getParent(); for (pred_iterator PI = pred_begin(parent), PE = pred_end(parent); PI != PE; ++PI) { - inserted |= nonLocalHelper(query, *PI, resp); + if (!visited.count(*PI)) + inserted |= nonLocalHelper(query, *PI, resp, visited); } if (!inserted) |