diff --git a/llvm/include/llvm/Analysis/AliasAnalysis.h b/llvm/include/llvm/Analysis/AliasAnalysis.h --- a/llvm/include/llvm/Analysis/AliasAnalysis.h +++ b/llvm/include/llvm/Analysis/AliasAnalysis.h @@ -985,15 +985,6 @@ ImmutablePass *createExternalAAWrapperPass( std::function Callback); -/// 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); - } // end namespace llvm #endif // LLVM_ANALYSIS_ALIASANALYSIS_H diff --git a/llvm/include/llvm/Analysis/BasicAliasAnalysis.h b/llvm/include/llvm/Analysis/BasicAliasAnalysis.h --- a/llvm/include/llvm/Analysis/BasicAliasAnalysis.h +++ b/llvm/include/llvm/Analysis/BasicAliasAnalysis.h @@ -176,28 +176,6 @@ FunctionPass *createBasicAAWrapperPass(); -/// A helper for the legacy pass manager to create a \c BasicAAResult object -/// populated to the best of our ability for a particular function when inside -/// of a \c ModulePass or a \c CallGraphSCCPass. -BasicAAResult createLegacyPMBasicAAResult(Pass &P, Function &F); - -/// This class is a functor to be used in legacy module or SCC passes for -/// computing AA results for a function. We store the results in fields so that -/// they live long enough to be queried, but we re-use them each time. -class LegacyAARGetter { - Pass &P; - std::optional BAR; - std::optional AAR; - -public: - LegacyAARGetter(Pass &P) : P(P) {} - AAResults &operator()(Function &F) { - BAR.emplace(createLegacyPMBasicAAResult(P, F)); - AAR.emplace(createLegacyPMAAResults(P, F, *BAR)); - return *AAR; - } -}; - } // end namespace llvm #endif // LLVM_ANALYSIS_BASICALIASANALYSIS_H diff --git a/llvm/lib/Analysis/AliasAnalysis.cpp b/llvm/lib/Analysis/AliasAnalysis.cpp --- a/llvm/lib/Analysis/AliasAnalysis.cpp +++ b/llvm/lib/Analysis/AliasAnalysis.cpp @@ -840,29 +840,6 @@ return R; } -AAResults llvm::createLegacyPMAAResults(Pass &P, Function &F, - BasicAAResult &BAR) { - AAResults AAR(P.getAnalysis().getTLI(F)); - - // Add in our explicitly constructed BasicAA results. - if (!DisableBasicAA) - AAR.addAAResult(BAR); - - // Populate the results with the other currently available AAs. - if (auto *WrapperPass = - P.getAnalysisIfAvailable()) - AAR.addAAResult(WrapperPass->getResult()); - if (auto *WrapperPass = P.getAnalysisIfAvailable()) - AAR.addAAResult(WrapperPass->getResult()); - if (auto *WrapperPass = P.getAnalysisIfAvailable()) - AAR.addAAResult(WrapperPass->getResult()); - if (auto *WrapperPass = P.getAnalysisIfAvailable()) - if (WrapperPass->CB) - WrapperPass->CB(P, F, AAR); - - return AAR; -} - bool llvm::isNoAliasCall(const Value *V) { if (const auto *Call = dyn_cast(V)) return Call->hasRetAttr(Attribute::NoAlias); diff --git a/llvm/lib/Analysis/BasicAliasAnalysis.cpp b/llvm/lib/Analysis/BasicAliasAnalysis.cpp --- a/llvm/lib/Analysis/BasicAliasAnalysis.cpp +++ b/llvm/lib/Analysis/BasicAliasAnalysis.cpp @@ -1827,10 +1827,3 @@ AU.addRequiredTransitive(); AU.addRequiredTransitive(); } - -BasicAAResult llvm::createLegacyPMBasicAAResult(Pass &P, Function &F) { - return BasicAAResult( - F.getParent()->getDataLayout(), F, - P.getAnalysis().getTLI(F), - P.getAnalysis().getAssumptionCache(F)); -}