recommit simplification (originally r109504, backed out in r109508) now that problem in CallSiteBase is fixed

llvm-svn: 109547
This commit is contained in:
Gabor Greif 2010-07-27 22:02:00 +00:00
parent 4fac280618
commit ef1ca24b91
1 changed files with 2 additions and 3 deletions

View File

@ -120,10 +120,9 @@ getCallSiteDependencyFrom(CallSite CS, bool isReadOnlyCall,
Pointer = CI->getArgOperand(0); Pointer = CI->getArgOperand(0);
// calls to free() erase the entire structure // calls to free() erase the entire structure
PointerSize = ~0ULL; PointerSize = ~0ULL;
} else if (isa<CallInst>(Inst) || isa<InvokeInst>(Inst)) { } else if (CallSite InstCS = Inst) {
// Debug intrinsics don't cause dependences. // Debug intrinsics don't cause dependences.
if (isa<DbgInfoIntrinsic>(Inst)) continue; if (isa<DbgInfoIntrinsic>(Inst)) continue;
CallSite InstCS = CallSite::get(Inst);
// If these two calls do not interfere, look past it. // If these two calls do not interfere, look past it.
switch (AA->getModRefInfo(CS, InstCS)) { switch (AA->getModRefInfo(CS, InstCS)) {
case AliasAnalysis::NoModRef: case AliasAnalysis::NoModRef:
@ -387,7 +386,7 @@ MemDepResult MemoryDependenceAnalysis::getDependency(Instruction *QueryInst) {
MemSize = cast<ConstantInt>(II->getArgOperand(1))->getZExtValue(); MemSize = cast<ConstantInt>(II->getArgOperand(1))->getZExtValue();
break; break;
default: default:
CallSite QueryCS = CallSite::get(QueryInst); CallSite QueryCS(QueryInst);
bool isReadOnly = AA->onlyReadsMemory(QueryCS); bool isReadOnly = AA->onlyReadsMemory(QueryCS);
LocalCache = getCallSiteDependencyFrom(QueryCS, isReadOnly, ScanPos, LocalCache = getCallSiteDependencyFrom(QueryCS, isReadOnly, ScanPos,
QueryParent); QueryParent);