Fix a bug in non-local memdep that was causing an infinite loop on 175.vpr.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@40495 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Owen Anderson
2007-07-25 21:26:36 +00:00
parent 2e3d6b4a27
commit 3dfcf33cf8
2 changed files with 27 additions and 3 deletions
+12 -3
View File
@@ -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)