replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix unchecked uses of DominatorTree in MemoryDependenceAnalysis. 

Use unknown results for places where it would be needed

llvm-svn: 181176
This commit is contained in:
Matt Arsenault 2013-05-06 02:07:24 +00:00
parent c229a4fff4
commit c23753a53e
4 changed files with 54 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
llvm/lib/Analysis/MemoryDependenceAnalysis.cpp
View File

@ -911,7 +911,6 @@ getNonLocalPointerDepFromBB(const PHITransAddr &Pointer,
SmallVectorImpl<NonLocalDepResult> &Result,
DenseMap<BasicBlock*, Value*> &Visited,
bool SkipFirstBlock) {
// Look up the cached info for Pointer.
ValueIsLoadPair CacheKey(Pointer.getAddr(), isLoad);
@ -999,8 +998,17 @@ getNonLocalPointerDepFromBB(const PHITransAddr &Pointer,
for (NonLocalDepInfo::iterator I = Cache->begin(), E = Cache->end();
I != E; ++I) {
Visited.insert(std::make_pair(I->getBB(), Addr));
if (!I->getResult().isNonLocal() && DT->isReachableFromEntry(I->getBB()))
if (I->getResult().isNonLocal()) {
continue;
}
if (!DT) {
Result.push_back(NonLocalDepResult(I->getBB(),
MemDepResult::getUnknown(),
Addr));
} else if (DT->isReachableFromEntry(I->getBB())) {
Result.push_back(NonLocalDepResult(I->getBB(), I->getResult(), Addr));
}
}
++NumCacheCompleteNonLocalPtr;
return false;
@ -1045,9 +1053,16 @@ getNonLocalPointerDepFromBB(const PHITransAddr &Pointer,
NumSortedEntries);
// If we got a Def or Clobber, add this to the list of results.
if (!Dep.isNonLocal() && DT->isReachableFromEntry(BB)) {
Result.push_back(NonLocalDepResult(BB, Dep, Pointer.getAddr()));
continue;
if (!Dep.isNonLocal()) {
if (!DT) {
Result.push_back(NonLocalDepResult(BB,
MemDepResult::getUnknown(),
Pointer.getAddr()));
continue;
} else if (DT->isReachableFromEntry(BB)) {
Result.push_back(NonLocalDepResult(BB, Dep, Pointer.getAddr()));
continue;
}
}
}

1
llvm/test/Analysis/MemoryDependenceAnalysis/lit.local.cfg Normal file
View File

@ -0,0 +1 @@
config.suffixes = ['.ll']

19
llvm/test/Analysis/MemoryDependenceAnalysis/memdep_requires_dominator_tree.ll Normal file
View File

@ -0,0 +1,19 @@
; RUN: opt -memdep -gvn < %s
define void @__memdep_requires_dominator_tree(i32* nocapture %bufUInt, i32* nocapture %pattern) nounwind {
entry:
br label %for.body
for.exit: ; preds = %for.body
ret void
for.body: ; preds = %for.body, %entry
%i.01 = phi i32 [ 0, %entry ], [ %tmp8.7, %for.body ]
%arrayidx = getelementptr i32* %bufUInt, i32 %i.01
%arrayidx5 = getelementptr i32* %pattern, i32 %i.01
%tmp6 = load i32* %arrayidx5, align 4
store i32 %tmp6, i32* %arrayidx, align 4
%tmp8.7 = add i32 %i.01, 8
%cmp.7 = icmp ult i32 %tmp8.7, 1024
br i1 %cmp.7, label %for.body, label %for.exit
}

14
llvm/test/Transforms/GVN/unreachable_block_infinite_loop.ll Normal file
View File

@ -0,0 +1,14 @@
; RUN: opt -memdep -gvn -disable-output
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
target triple = "x86_64-apple-darwin10.0"
define i32 @test2() nounwind ssp {
entry:
ret i32 0
unreachable_block:
%a = add i32 %a, 1
ret i32 %a
}