diff options
| author | Gabor Greif <ggreif@gmail.com> | 2010-07-27 15:18:11 +0000 |
|---|---|---|
| committer | Gabor Greif <ggreif@gmail.com> | 2010-07-27 15:18:11 +0000 |
| commit | ed1d92cb9a5ccf9f09e836c6741da19c8350ce07 (patch) | |
| tree | 38e97b60164f5319eb06da23eb0b165fec3f626c /llvm/lib/Analysis/MemoryDependenceAnalysis.cpp | |
| parent | 6014edd1178f32f07e05e2b825743b610eae4ebe (diff) | |
| download | llvm-ed1d92cb9a5ccf9f09e836c6741da19c8350ce07.zip llvm-ed1d92cb9a5ccf9f09e836c6741da19c8350ce07.tar.gz llvm-ed1d92cb9a5ccf9f09e836c6741da19c8350ce07.tar.bz2 | |
back out r109504, breaks the bots
llvm-svn: 109508
Diffstat (limited to 'llvm/lib/Analysis/MemoryDependenceAnalysis.cpp')
| -rw-r--r-- | llvm/lib/Analysis/MemoryDependenceAnalysis.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/llvm/lib/Analysis/MemoryDependenceAnalysis.cpp b/llvm/lib/Analysis/MemoryDependenceAnalysis.cpp index 662752f..947a810 100644 --- a/llvm/lib/Analysis/MemoryDependenceAnalysis.cpp +++ b/llvm/lib/Analysis/MemoryDependenceAnalysis.cpp @@ -120,9 +120,10 @@ getCallSiteDependencyFrom(CallSite CS, bool isReadOnlyCall, Pointer = CI->getArgOperand(0); // calls to free() erase the entire structure PointerSize = ~0ULL; - } else if (CallSite InstCS = Inst) { + } else if (isa<CallInst>(Inst) || isa<InvokeInst>(Inst)) { // Debug intrinsics don't cause dependences. if (isa<DbgInfoIntrinsic>(Inst)) continue; + CallSite InstCS = CallSite::get(Inst); // If these two calls do not interfere, look past it. switch (AA->getModRefInfo(CS, InstCS)) { case AliasAnalysis::NoModRef: @@ -386,7 +387,7 @@ MemDepResult MemoryDependenceAnalysis::getDependency(Instruction *QueryInst) { MemSize = cast<ConstantInt>(II->getArgOperand(1))->getZExtValue(); break; default: - CallSite QueryCS(QueryInst); + CallSite QueryCS = CallSite::get(QueryInst); bool isReadOnly = AA->onlyReadsMemory(QueryCS); LocalCache = getCallSiteDependencyFrom(QueryCS, isReadOnly, ScanPos, QueryParent); |