diff options
Diffstat (limited to 'lib/Analysis/MemDepPrinter.cpp')
| -rw-r--r-- | lib/Analysis/MemDepPrinter.cpp | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/lib/Analysis/MemDepPrinter.cpp b/lib/Analysis/MemDepPrinter.cpp index 597daff8db..90a7c576f0 100644 --- a/lib/Analysis/MemDepPrinter.cpp +++ b/lib/Analysis/MemDepPrinter.cpp @@ -11,6 +11,7 @@ //===----------------------------------------------------------------------===// #include "llvm/Analysis/MemoryDependenceAnalysis.h" +#include "llvm/LLVMContext.h" #include "llvm/Analysis/Passes.h" #include "llvm/Assembly/Writer.h" #include "llvm/Support/CallSite.h" @@ -40,7 +41,8 @@ namespace { void print(raw_ostream &OS, const Module * = 0) const; virtual void getAnalysisUsage(AnalysisUsage &AU) const { - AU.addRequired<MemoryDependenceAnalysis>(); + AU.addRequiredTransitive<AliasAnalysis>(); + AU.addRequiredTransitive<MemoryDependenceAnalysis>(); AU.setPreservesAll(); } @@ -64,6 +66,7 @@ FunctionPass *llvm::createMemDepPrinter() { bool MemDepPrinter::runOnFunction(Function &F) { this->F = &F; + AliasAnalysis &AA = getAnalysis<AliasAnalysis>(); MemoryDependenceAnalysis &MDA = getAnalysis<MemoryDependenceAnalysis>(); // All this code uses non-const interfaces because MemDep is not @@ -99,15 +102,23 @@ bool MemDepPrinter::runOnFunction(Function &F) { SmallVector<NonLocalDepResult, 4> NLDI; if (LoadInst *LI = dyn_cast<LoadInst>(Inst)) { // FIXME: Volatile is not handled properly here. - MDA.getNonLocalPointerDependency(LI->getPointerOperand(), !LI->isVolatile(), + AliasAnalysis::Location Loc(LI->getPointerOperand(), + AA.getTypeStoreSize(LI->getType()), + LI->getMetadata(LLVMContext::MD_tbaa)); + MDA.getNonLocalPointerDependency(Loc, !LI->isVolatile(), LI->getParent(), NLDI); } else if (StoreInst *SI = dyn_cast<StoreInst>(Inst)) { // FIXME: Volatile is not handled properly here. - MDA.getNonLocalPointerDependency(SI->getPointerOperand(), false, - SI->getParent(), NLDI); + AliasAnalysis::Location Loc(SI->getPointerOperand(), + AA.getTypeStoreSize(SI->getValueOperand() + ->getType()), + SI->getMetadata(LLVMContext::MD_tbaa)); + MDA.getNonLocalPointerDependency(Loc, false, SI->getParent(), NLDI); } else if (VAArgInst *VI = dyn_cast<VAArgInst>(Inst)) { - MDA.getNonLocalPointerDependency(VI->getPointerOperand(), false, - VI->getParent(), NLDI); + AliasAnalysis::Location Loc(SI->getPointerOperand(), + AliasAnalysis::UnknownSize, + SI->getMetadata(LLVMContext::MD_tbaa)); + MDA.getNonLocalPointerDependency(Loc, false, VI->getParent(), NLDI); } else { llvm_unreachable("Unknown memory instruction!"); } |