diff options
| -rw-r--r-- | llvm/include/llvm/Analysis/AliasAnalysis.h | 8 | ||||
| -rw-r--r-- | llvm/lib/Analysis/AliasAnalysis.cpp | 11 | ||||
| -rw-r--r-- | llvm/lib/Transforms/IPO/ArgumentPromotion.cpp | 1 | ||||
| -rw-r--r-- | llvm/lib/Transforms/IPO/FunctionAttrs.cpp | 1 | ||||
| -rw-r--r-- | llvm/lib/Transforms/IPO/Inliner.cpp | 1 | ||||
| -rw-r--r-- | llvm/test/Analysis/alias-analysis-uses.ll | 10 |
6 files changed, 32 insertions, 0 deletions
diff --git a/llvm/include/llvm/Analysis/AliasAnalysis.h b/llvm/include/llvm/Analysis/AliasAnalysis.h index e2ca0ab1229..d63e7b0ddad 100644 --- a/llvm/include/llvm/Analysis/AliasAnalysis.h +++ b/llvm/include/llvm/Analysis/AliasAnalysis.h @@ -1057,8 +1057,16 @@ ImmutablePass *createExternalAAWrapperPass( /// A helper for the legacy pass manager to create a \c AAResults /// object populated to the best of our ability for a particular function when /// inside of a \c ModulePass or a \c CallGraphSCCPass. +/// +/// If a \c ModulePass or a \c CallGraphSCCPass calls \p +/// createLegacyPMAAResults, it also needs to call \p addUsedAAAnalyses in \p +/// getAnalysisUsage. AAResults createLegacyPMAAResults(Pass &P, Function &F, BasicAAResult &BAR); +/// A helper for the legacy pass manager to populate \p AU to add uses to make +/// sure the analyses required by \p createLegacyPMAAResults are available. +void addUsedAAAnalyses(AnalysisUsage &AU); + } // End llvm namespace #endif diff --git a/llvm/lib/Analysis/AliasAnalysis.cpp b/llvm/lib/Analysis/AliasAnalysis.cpp index 8c06031fed8..a30aedc4060 100644 --- a/llvm/lib/Analysis/AliasAnalysis.cpp +++ b/llvm/lib/Analysis/AliasAnalysis.cpp @@ -563,3 +563,14 @@ bool llvm::isIdentifiedObject(const Value *V) { bool llvm::isIdentifiedFunctionLocal(const Value *V) { return isa<AllocaInst>(V) || isNoAliasCall(V) || isNoAliasArgument(V); } + +void llvm::addUsedAAAnalyses(AnalysisUsage &AU) { + // This function needs to be in sync with llvm::createLegacyPMAAResults -- if + // more alias analyses are added to llvm::createLegacyPMAAResults, they need + // to be added here also. + AU.addUsedIfAvailable<ScopedNoAliasAAWrapperPass>(); + AU.addUsedIfAvailable<TypeBasedAAWrapperPass>(); + AU.addUsedIfAvailable<objcarc::ObjCARCAAWrapperPass>(); + AU.addUsedIfAvailable<GlobalsAAWrapperPass>(); + AU.addUsedIfAvailable<CFLAAWrapperPass>(); +} diff --git a/llvm/lib/Transforms/IPO/ArgumentPromotion.cpp b/llvm/lib/Transforms/IPO/ArgumentPromotion.cpp index 0e05129b526..51eb36434f9 100644 --- a/llvm/lib/Transforms/IPO/ArgumentPromotion.cpp +++ b/llvm/lib/Transforms/IPO/ArgumentPromotion.cpp @@ -68,6 +68,7 @@ namespace { void getAnalysisUsage(AnalysisUsage &AU) const override { AU.addRequired<AssumptionCacheTracker>(); AU.addRequired<TargetLibraryInfoWrapperPass>(); + addUsedAAAnalyses(AU); CallGraphSCCPass::getAnalysisUsage(AU); } diff --git a/llvm/lib/Transforms/IPO/FunctionAttrs.cpp b/llvm/lib/Transforms/IPO/FunctionAttrs.cpp index 527fdd1885a..b84620c4811 100644 --- a/llvm/lib/Transforms/IPO/FunctionAttrs.cpp +++ b/llvm/lib/Transforms/IPO/FunctionAttrs.cpp @@ -64,6 +64,7 @@ struct PostOrderFunctionAttrs : public CallGraphSCCPass { AU.setPreservesCFG(); AU.addRequired<AssumptionCacheTracker>(); AU.addRequired<TargetLibraryInfoWrapperPass>(); + addUsedAAAnalyses(AU); CallGraphSCCPass::getAnalysisUsage(AU); } diff --git a/llvm/lib/Transforms/IPO/Inliner.cpp b/llvm/lib/Transforms/IPO/Inliner.cpp index bdef4733906..a02d85a6263 100644 --- a/llvm/lib/Transforms/IPO/Inliner.cpp +++ b/llvm/lib/Transforms/IPO/Inliner.cpp @@ -58,6 +58,7 @@ Inliner::Inliner(char &ID, bool InsertLifetime) void Inliner::getAnalysisUsage(AnalysisUsage &AU) const { AU.addRequired<AssumptionCacheTracker>(); AU.addRequired<TargetLibraryInfoWrapperPass>(); + addUsedAAAnalyses(AU); CallGraphSCCPass::getAnalysisUsage(AU); } diff --git a/llvm/test/Analysis/alias-analysis-uses.ll b/llvm/test/Analysis/alias-analysis-uses.ll new file mode 100644 index 00000000000..4163ec25584 --- /dev/null +++ b/llvm/test/Analysis/alias-analysis-uses.ll @@ -0,0 +1,10 @@ +; RUN: opt -debug-pass=Executions -globals-aa -functionattrs -disable-output < %s 2>&1 | FileCheck %s + +; CHECK: Executing Pass 'Globals Alias Analysis' +; CHECK-NOT: Freeing Pass 'Globals Alias Analysis' +; CHECK: Executing Pass 'Deduce function attributes' +; CHECK: Freeing Pass 'Globals Alias Analysis' + +define void @test(i8* %p) { + ret void +} |
