diff options
author | Sean Silva <chisophugis@gmail.com> | 2016-08-09 00:28:15 +0000 |
---|---|---|
committer | Sean Silva <chisophugis@gmail.com> | 2016-08-09 00:28:15 +0000 |
commit | 20b343c051891a5e1902fa0aad839f3ab08396f5 (patch) | |
tree | 742151e49168a88d048c19a2c68d2dea1b83a8b1 | |
parent | b79146f48d8ae6128179695713a67023b407915a (diff) |
Consistently use FunctionAnalysisManager
Besides a general consistently benefit, the extra layer of indirection
allows the mechanical part of https://reviews.llvm.org/D23256 that
requires touching every transformation and analysis to be factored out
cleanly.
Thanks to David for the suggestion.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@278077 91177308-0d34-0410-b5e6-96231b3b80d8
83 files changed, 108 insertions, 108 deletions
diff --git a/include/llvm/Analysis/AliasAnalysis.h b/include/llvm/Analysis/AliasAnalysis.h index d6308b7073a..1dc0b73a610 100644 --- a/include/llvm/Analysis/AliasAnalysis.h +++ b/include/llvm/Analysis/AliasAnalysis.h @@ -878,7 +878,7 @@ public: ResultGetters.push_back(&getModuleAAResultImpl<AnalysisT>); } - Result run(Function &F, AnalysisManager<Function> &AM) { + Result run(Function &F, FunctionAnalysisManager &AM) { Result R(AM.getResult<TargetLibraryAnalysis>(F)); for (auto &Getter : ResultGetters) (*Getter)(F, AM, R); @@ -889,19 +889,19 @@ private: friend AnalysisInfoMixin<AAManager>; static char PassID; - SmallVector<void (*)(Function &F, AnalysisManager<Function> &AM, + SmallVector<void (*)(Function &F, FunctionAnalysisManager &AM, AAResults &AAResults), 4> ResultGetters; template <typename AnalysisT> static void getFunctionAAResultImpl(Function &F, - AnalysisManager<Function> &AM, + FunctionAnalysisManager &AM, AAResults &AAResults) { AAResults.addAAResult(AM.template getResult<AnalysisT>(F)); } template <typename AnalysisT> - static void getModuleAAResultImpl(Function &F, AnalysisManager<Function> &AM, + static void getModuleAAResultImpl(Function &F, FunctionAnalysisManager &AM, AAResults &AAResults) { auto &MAM = AM.getResult<ModuleAnalysisManagerFunctionProxy>(F).getManager(); diff --git a/include/llvm/Analysis/AliasAnalysisEvaluator.h b/include/llvm/Analysis/AliasAnalysisEvaluator.h index 505ed0d9723..21457485265 100644 --- a/include/llvm/Analysis/AliasAnalysisEvaluator.h +++ b/include/llvm/Analysis/AliasAnalysisEvaluator.h @@ -53,7 +53,7 @@ public: ~AAEvaluator(); /// \brief Run the pass over the function. - PreservedAnalyses run(Function &F, AnalysisManager<Function> &AM); + PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM); private: // Allow the legacy pass to run this using an internal API. diff --git a/include/llvm/Analysis/AssumptionCache.h b/include/llvm/Analysis/AssumptionCache.h index 06f2a117ac2..895b85448ca 100644 --- a/include/llvm/Analysis/AssumptionCache.h +++ b/include/llvm/Analysis/AssumptionCache.h @@ -117,7 +117,7 @@ class AssumptionPrinterPass : public PassInfoMixin<AssumptionPrinterPass> { public: explicit AssumptionPrinterPass(raw_ostream &OS) : OS(OS) {} - PreservedAnalyses run(Function &F, AnalysisManager<Function> &AM); + PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM); }; /// \brief An immutable pass that tracks lazily created \c AssumptionCache diff --git a/include/llvm/Analysis/BasicAliasAnalysis.h b/include/llvm/Analysis/BasicAliasAnalysis.h index ff3b28891a9..37dfb483862 100644 --- a/include/llvm/Analysis/BasicAliasAnalysis.h +++ b/include/llvm/Analysis/BasicAliasAnalysis.h @@ -198,7 +198,7 @@ class BasicAA : public AnalysisInfoMixin<BasicAA> { public: typedef BasicAAResult Result; - BasicAAResult run(Function &F, AnalysisManager<Function> &AM); + BasicAAResult run(Function &F, FunctionAnalysisManager &AM); }; /// Legacy wrapper pass to provide the BasicAAResult object. diff --git a/include/llvm/Analysis/BlockFrequencyInfo.h b/include/llvm/Analysis/BlockFrequencyInfo.h index d7e76a11738..5a06a797f52 100644 --- a/include/llvm/Analysis/BlockFrequencyInfo.h +++ b/include/llvm/Analysis/BlockFrequencyInfo.h @@ -97,7 +97,7 @@ public: typedef BlockFrequencyInfo Result; /// \brief Run the analysis pass over a function and produce BFI. - Result run(Function &F, AnalysisManager<Function> &AM); + Result run(Function &F, FunctionAnalysisManager &AM); }; /// \brief Printer pass for the \c BlockFrequencyInfo results. @@ -107,7 +107,7 @@ class BlockFrequencyPrinterPass public: explicit BlockFrequencyPrinterPass(raw_ostream &OS) : OS(OS) {} - PreservedAnalyses run(Function &F, AnalysisManager<Function> &AM); + PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM); }; /// \brief Legacy analysis pass which computes \c BlockFrequencyInfo. diff --git a/include/llvm/Analysis/BranchProbabilityInfo.h b/include/llvm/Analysis/BranchProbabilityInfo.h index 6434ba962eb..49a04700beb 100644 --- a/include/llvm/Analysis/BranchProbabilityInfo.h +++ b/include/llvm/Analysis/BranchProbabilityInfo.h @@ -185,7 +185,7 @@ public: typedef BranchProbabilityInfo Result; /// \brief Run the analysis pass over a function and produce BPI. - BranchProbabilityInfo run(Function &F, AnalysisManager<Function> &AM); + BranchProbabilityInfo run(Function &F, FunctionAnalysisManager &AM); }; /// \brief Printer pass for the \c BranchProbabilityAnalysis results. @@ -195,7 +195,7 @@ class BranchProbabilityPrinterPass public: explicit BranchProbabilityPrinterPass(raw_ostream &OS) : OS(OS) {} - PreservedAnalyses run(Function &F, AnalysisManager<Function> &AM); + PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM); }; /// \brief Legacy analysis pass which computes \c BranchProbabilityInfo. diff --git a/include/llvm/Analysis/CFLAndersAliasAnalysis.h b/include/llvm/Analysis/CFLAndersAliasAnalysis.h index 48eca888419..adebfe9549f 100644 --- a/include/llvm/Analysis/CFLAndersAliasAnalysis.h +++ b/include/llvm/Analysis/CFLAndersAliasAnalysis.h @@ -108,7 +108,7 @@ class CFLAndersAA : public AnalysisInfoMixin<CFLAndersAA> { public: typedef CFLAndersAAResult Result; - CFLAndersAAResult run(Function &F, AnalysisManager<Function> &AM); + CFLAndersAAResult run(Function &F, FunctionAnalysisManager &AM); }; /// Legacy wrapper pass to provide the CFLAndersAAResult object. diff --git a/include/llvm/Analysis/CFLSteensAliasAnalysis.h b/include/llvm/Analysis/CFLSteensAliasAnalysis.h index b366f865919..4d697254eb3 100644 --- a/include/llvm/Analysis/CFLSteensAliasAnalysis.h +++ b/include/llvm/Analysis/CFLSteensAliasAnalysis.h @@ -127,7 +127,7 @@ class CFLSteensAA : public AnalysisInfoMixin<CFLSteensAA> { public: typedef CFLSteensAAResult Result; - CFLSteensAAResult run(Function &F, AnalysisManager<Function> &AM); + CFLSteensAAResult run(Function &F, FunctionAnalysisManager &AM); }; /// Legacy wrapper pass to provide the CFLSteensAAResult object. diff --git a/include/llvm/Analysis/DemandedBits.h b/include/llvm/Analysis/DemandedBits.h index fafd5d00b48..354a5b33895 100644 --- a/include/llvm/Analysis/DemandedBits.h +++ b/include/llvm/Analysis/DemandedBits.h @@ -97,7 +97,7 @@ public: /// \brief Run the analysis pass over a function and produce demanded bits /// information. - DemandedBits run(Function &F, AnalysisManager<Function> &AM); + DemandedBits run(Function &F, FunctionAnalysisManager &AM); }; /// \brief Printer pass for DemandedBits @@ -106,7 +106,7 @@ class DemandedBitsPrinterPass : public PassInfoMixin<DemandedBitsPrinterPass> { public: explicit DemandedBitsPrinterPass(raw_ostream &OS) : OS(OS) {} - PreservedAnalyses run(Function &F, AnalysisManager<Function> &AM); + PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM); }; /// Create a demanded bits analysis pass. diff --git a/include/llvm/Analysis/DominanceFrontier.h b/include/llvm/Analysis/DominanceFrontier.h index 79672e4e422..5a535a37883 100644 --- a/include/llvm/Analysis/DominanceFrontier.h +++ b/include/llvm/Analysis/DominanceFrontier.h @@ -178,7 +178,7 @@ public: typedef DominanceFrontier Result; /// \brief Run the analysis pass over a function and produce a dominator tree. - DominanceFrontier run(Function &F, AnalysisManager<Function> &AM); + DominanceFrontier run(Function &F, FunctionAnalysisManager &AM); }; /// \brief Printer pass for the \c DominanceFrontier. @@ -188,7 +188,7 @@ class DominanceFrontierPrinterPass public: explicit DominanceFrontierPrinterPass(raw_ostream &OS); - PreservedAnalyses run(Function &F, AnalysisManager<Function> &AM); + PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM); }; } // End llvm namespace diff --git a/include/llvm/Analysis/LoopInfo.h b/include/llvm/Analysis/LoopInfo.h index 29987232329..18bb4f440f4 100644 --- a/include/llvm/Analysis/LoopInfo.h +++ b/include/llvm/Analysis/LoopInfo.h @@ -794,7 +794,7 @@ class LoopAnalysis : public AnalysisInfoMixin<LoopAnalysis> { public: typedef LoopInfo Result; - LoopInfo run(Function &F, AnalysisManager<Function> &AM); + LoopInfo run(Function &F, FunctionAnalysisManager &AM); }; /// \brief Printer pass for the \c LoopAnalysis results. @@ -803,12 +803,12 @@ class LoopPrinterPass : public PassInfoMixin<LoopPrinterPass> { public: explicit LoopPrinterPass(raw_ostream &OS) : OS(OS) {} - PreservedAnalyses run(Function &F, AnalysisManager<Function> &AM); + PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM); }; /// \brief Verifier pass for the \c LoopAnalysis results. struct LoopVerifierPass : public PassInfoMixin<LoopVerifierPass> { - PreservedAnalyses run(Function &F, AnalysisManager<Function> &AM); + PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM); }; /// \brief The legacy pass manager's analysis pass to compute loop information. diff --git a/include/llvm/Analysis/MemoryDependenceAnalysis.h b/include/llvm/Analysis/MemoryDependenceAnalysis.h index b19dabbfc32..01d060f30c8 100644 --- a/include/llvm/Analysis/MemoryDependenceAnalysis.h +++ b/include/llvm/Analysis/MemoryDependenceAnalysis.h @@ -479,7 +479,7 @@ class MemoryDependenceAnalysis public: typedef MemoryDependenceResults Result; - MemoryDependenceResults run(Function &F, AnalysisManager<Function> &AM); + MemoryDependenceResults run(Function &F, FunctionAnalysisManager &AM); }; /// A wrapper analysis pass for the legacy pass manager that exposes a \c diff --git a/include/llvm/Analysis/ObjCARCAliasAnalysis.h b/include/llvm/Analysis/ObjCARCAliasAnalysis.h index 067a964bcce..8f4ed6c4bc2 100644 --- a/include/llvm/Analysis/ObjCARCAliasAnalysis.h +++ b/include/llvm/Analysis/ObjCARCAliasAnalysis.h @@ -68,7 +68,7 @@ class ObjCARCAA : public AnalysisInfoMixin<ObjCARCAA> { public: typedef ObjCARCAAResult Result; - ObjCARCAAResult run(Function &F, AnalysisManager<Function> &AM); + ObjCARCAAResult run(Function &F, FunctionAnalysisManager &AM); }; /// Legacy wrapper pass to provide the ObjCARCAAResult object. diff --git a/include/llvm/Analysis/OptimizationDiagnosticInfo.h b/include/llvm/Analysis/OptimizationDiagnosticInfo.h index 41e80bf7c8c..981e5c26ee7 100644 --- a/include/llvm/Analysis/OptimizationDiagnosticInfo.h +++ b/include/llvm/Analysis/OptimizationDiagnosticInfo.h @@ -183,7 +183,7 @@ public: typedef OptimizationRemarkEmitter Result; /// \brief Run the analysis pass over a function and produce BFI. - Result run(Function &F, AnalysisManager<Function> &AM); + Result run(Function &F, FunctionAnalysisManager &AM); }; } #endif // LLVM_IR_OPTIMIZATIONDIAGNOSTICINFO_H diff --git a/include/llvm/Analysis/PostDominators.h b/include/llvm/Analysis/PostDominators.h index 99240a40408..b7638b7776f 100644 --- a/include/llvm/Analysis/PostDominators.h +++ b/include/llvm/Analysis/PostDominators.h @@ -58,7 +58,7 @@ class PostDominatorTreePrinterPass public: explicit PostDominatorTreePrinterPass(raw_ostream &OS); - PreservedAnalyses run(Function &F, AnalysisManager<Function> &AM); + PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM); }; struct PostDominatorTreeWrapperPass : public FunctionPass { diff --git a/include/llvm/Analysis/RegionInfo.h b/include/llvm/Analysis/RegionInfo.h index 9c95a1fb682..10b84765293 100644 --- a/include/llvm/Analysis/RegionInfo.h +++ b/include/llvm/Analysis/RegionInfo.h @@ -937,7 +937,7 @@ class RegionInfoAnalysis : public AnalysisInfoMixin<RegionInfoAnalysis> { public: typedef RegionInfo Result; - RegionInfo run(Function &F, AnalysisManager<Function> &AM); + RegionInfo run(Function &F, FunctionAnalysisManager &AM); }; /// \brief Printer pass for the \c RegionInfo. @@ -946,12 +946,12 @@ class RegionInfoPrinterPass : public PassInfoMixin<RegionInfoPrinterPass> { public: explicit RegionInfoPrinterPass(raw_ostream &OS); - PreservedAnalyses run(Function &F, AnalysisManager<Function> &AM); + PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM); }; /// \brief Verifier pass for the \c RegionInfo. struct RegionInfoVerifierPass : PassInfoMixin<RegionInfoVerifierPass> { - PreservedAnalyses run(Function &F, AnalysisManager<Function> &AM); + PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM); }; template <> diff --git a/include/llvm/Analysis/ScalarEvolution.h b/include/llvm/Analysis/ScalarEvolution.h index 5d1c60491f0..fbabed0d92a 100644 --- a/include/llvm/Analysis/ScalarEvolution.h +++ b/include/llvm/Analysis/ScalarEvolution.h @@ -1681,7 +1681,7 @@ namespace llvm { public: typedef ScalarEvolution Result; - ScalarEvolution run(Function &F, AnalysisManager<Function> &AM); + ScalarEvolution run(Function &F, FunctionAnalysisManager &AM); }; /// Printer pass for the \c ScalarEvolutionAnalysis results. @@ -1691,7 +1691,7 @@ namespace llvm { public: explicit ScalarEvolutionPrinterPass(raw_ostream &OS) : OS(OS) {} - PreservedAnalyses run(Function &F, AnalysisManager<Function> &AM); + PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM); }; class ScalarEvolutionWrapperPass : public FunctionPass { diff --git a/include/llvm/Analysis/ScalarEvolutionAliasAnalysis.h b/include/llvm/Analysis/ScalarEvolutionAliasAnalysis.h index ac10370b413..023754eb2a1 100644 --- a/include/llvm/Analysis/ScalarEvolutionAliasAnalysis.h +++ b/include/llvm/Analysis/ScalarEvolutionAliasAnalysis.h @@ -45,7 +45,7 @@ class SCEVAA : public AnalysisInfoMixin<SCEVAA> { public: typedef SCEVAAResult Result; - SCEVAAResult run(Function &F, AnalysisManager<Function> &AM); + SCEVAAResult run(Function &F, FunctionAnalysisManager &AM); }; /// Legacy wrapper pass to provide the SCEVAAResult object. diff --git a/include/llvm/Analysis/ScopedNoAliasAA.h b/include/llvm/Analysis/ScopedNoAliasAA.h index 87b85d4e663..11ffc626061 100644 --- a/include/llvm/Analysis/ScopedNoAliasAA.h +++ b/include/llvm/Analysis/ScopedNoAliasAA.h @@ -54,7 +54,7 @@ class ScopedNoAliasAA : public AnalysisInfoMixin<ScopedNoAliasAA> { public: typedef ScopedNoAliasAAResult Result; - ScopedNoAliasAAResult run(Function &F, AnalysisManager<Function> &AM); + ScopedNoAliasAAResult run(Function &F, FunctionAnalysisManager &AM); }; /// Legacy wrapper pass to provide the ScopedNoAliasAAResult object. diff --git a/include/llvm/Analysis/TargetTransformInfo.h b/include/llvm/Analysis/TargetTransformInfo.h index 214f53e3dc7..e7b25c517c1 100644 --- a/include/llvm/Analysis/TargetTransformInfo.h +++ b/include/llvm/Analysis/TargetTransformInfo.h @@ -1028,7 +1028,7 @@ public: return *this; } - Result run(const Function &F, AnalysisManager<Function> &); + Result run(const Function &F, FunctionAnalysisManager &); private: friend AnalysisInfoMixin<TargetIRAnalysis>; diff --git a/include/llvm/Analysis/TypeBasedAliasAnalysis.h b/include/llvm/Analysis/TypeBasedAliasAnalysis.h index 229b0f97b98..f278ff420b1 100644 --- a/include/llvm/Analysis/TypeBasedAliasAnalysis.h +++ b/include/llvm/Analysis/TypeBasedAliasAnalysis.h @@ -55,7 +55,7 @@ class TypeBasedAA : public AnalysisInfoMixin<TypeBasedAA> { public: typedef TypeBasedAAResult Result; - TypeBasedAAResult run(Function &F, AnalysisManager<Function> &AM); + TypeBasedAAResult run(Function &F, FunctionAnalysisManager &AM); }; /// Legacy wrapper pass to provide the TypeBasedAAResult object. diff --git a/include/llvm/IR/Dominators.h b/include/llvm/IR/Dominators.h index f445a49b67b..431d4292fe7 100644 --- a/include/llvm/IR/Dominators.h +++ b/include/llvm/IR/Dominators.h @@ -208,7 +208,7 @@ public: typedef DominatorTree Result; /// \brief Run the analysis pass over a function and produce a dominator tree. - DominatorTree run(Function &F, AnalysisManager<Function> &); + DominatorTree run(Function &F, FunctionAnalysisManager &); }; /// \brief Printer pass for the \c DominatorTree. @@ -218,12 +218,12 @@ class DominatorTreePrinterPass public: explicit DominatorTreePrinterPass(raw_ostream &OS); - PreservedAnalyses run(Function &F, AnalysisManager<Function> &AM); + PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM); }; /// \brief Verifier pass for the \c DominatorTree. struct DominatorTreeVerifierPass : PassInfoMixin<DominatorTreeVerifierPass> { - PreservedAnalyses run(Function &F, AnalysisManager<Function> &AM); + PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM); }; /// \brief Legacy analysis pass which computes a \c DominatorTree. diff --git a/include/llvm/Transforms/InstCombine/InstCombine.h b/include/llvm/Transforms/InstCombine/InstCombine.h index d70b847c689..b89c1bdaf10 100644 --- a/include/llvm/Transforms/InstCombine/InstCombine.h +++ b/include/llvm/Transforms/InstCombine/InstCombine.h @@ -43,7 +43,7 @@ public: return *this; } - PreservedAnalyses run(Function &F, AnalysisManager<Function> &AM); + PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM); }; /// \brief The legacy pass manager's instcombine pass. diff --git a/include/llvm/Transforms/Scalar/DCE.h b/include/llvm/Transforms/Scalar/DCE.h index d9f921e1e7c..273346cf81d 100644 --- a/include/llvm/Transforms/Scalar/DCE.h +++ b/include/llvm/Transforms/Scalar/DCE.h @@ -22,7 +22,7 @@ namespace llvm { /// Basic Dead Code Elimination pass. class DCEPass : public PassInfoMixin<DCEPass> { public: - PreservedAnalyses run(Function &F, AnalysisManager<Function> &AM); + PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM); }; } diff --git a/include/llvm/Transforms/Scalar/DeadStoreElimination.h b/include/llvm/Transforms/Scalar/DeadStoreElimination.h index 7826e29f178..3ae999dfb54 100644 --- a/include/llvm/Transforms/Scalar/DeadStoreElimination.h +++ b/include/llvm/Transforms/Scalar/DeadStoreElimination.h @@ -27,7 +27,7 @@ namespace llvm { /// only the redundant stores that are local to a single Basic Block. class DSEPass : public PassInfoMixin<DSEPass> { public: - PreservedAnalyses run(Function &F, AnalysisManager<Function> &FAM); + PreservedAnalyses run(Function &F, FunctionAnalysisManager &FAM); }; } diff --git a/include/llvm/Transforms/Scalar/EarlyCSE.h b/include/llvm/Transforms/Scalar/EarlyCSE.h index 80e3c602a2b..418ce155259 100644 --- a/include/llvm/Transforms/Scalar/EarlyCSE.h +++ b/include/llvm/Transforms/Scalar/EarlyCSE.h @@ -28,7 +28,7 @@ namespace llvm { /// expected that a later pass of GVN will catch the interesting/hard cases. struct EarlyCSEPass : PassInfoMixin<EarlyCSEPass> { /// \brief Run the pass over the function. - PreservedAnalyses run(Function &F, AnalysisManager<Function> &AM); + PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM); }; } diff --git a/include/llvm/Transforms/Scalar/GVN.h b/include/llvm/Transforms/Scalar/GVN.h index 3bb5ec39227..a86a9a8c448 100644 --- a/include/llvm/Transforms/Scalar/GVN.h +++ b/include/llvm/Transforms/Scalar/GVN.h @@ -45,7 +45,7 @@ class GVN : public PassInfoMixin<GVN> { public: /// \brief Run the pass over the function. - PreservedAnalyses run(Function &F, AnalysisManager<Function> &AM); + PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM); /// This removes the specified instruction from /// our various maps and marks it for deletion. @@ -232,7 +232,7 @@ FunctionPass *createGVNPass(bool NoLoads = false); /// from sibling branches. struct GVNHoistPass : PassInfoMixin<GVNHoistPass> { /// \brief Run the pass over the function. - PreservedAnalyses run(Function &F, AnalysisManager<Function> &AM); + PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM); }; } diff --git a/include/llvm/Transforms/Scalar/GuardWidening.h b/include/llvm/Transforms/Scalar/GuardWidening.h index 201065cbdfb..2bc0940ac71 100644 --- a/include/llvm/Transforms/Scalar/GuardWidening.h +++ b/include/llvm/Transforms/Scalar/GuardWidening.h @@ -24,7 +24,7 @@ namespace llvm { class Function; struct GuardWideningPass : public PassInfoMixin<GuardWideningPass> { - PreservedAnalyses run(Function &F, AnalysisManager<Function> &AM); + PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM); }; } diff --git a/include/llvm/Transforms/Scalar/JumpThreading.h b/include/llvm/Transforms/Scalar/JumpThreading.h index e38bdd03ac0..13ab78ade46 100644 --- a/include/llvm/Transforms/Scalar/JumpThreading.h +++ b/include/llvm/Transforms/Scalar/JumpThreading.h @@ -98,7 +98,7 @@ public: bool HasProfileData_, std::unique_ptr<BlockFrequencyInfo> BFI_, std::unique_ptr<BranchProbabilityInfo> BPI_); - PreservedAnalyses run(Function &F, AnalysisManager<Function> &AM); + PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM); void releaseMemory() { BFI.reset(); diff --git a/include/llvm/Transforms/Scalar/MergedLoadStoreMotion.h b/include/llvm/Transforms/Scalar/MergedLoadStoreMotion.h index 47cfea48924..3cad7bb070d 100644 --- a/include/llvm/Transforms/Scalar/MergedLoadStoreMotion.h +++ b/include/llvm/Transforms/Scalar/MergedLoadStoreMotion.h @@ -31,7 +31,7 @@ namespace llvm { class MergedLoadStoreMotionPass : public PassInfoMixin<MergedLoadStoreMotionPass> { public: - PreservedAnalyses run(Function &F, AnalysisManager<Function> &AM); + PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM); }; } diff --git a/include/llvm/Transforms/Scalar/PartiallyInlineLibCalls.h b/include/llvm/Transforms/Scalar/PartiallyInlineLibCalls.h index 385bbb40db3..7f73831e0eb 100644 --- a/include/llvm/Transforms/Scalar/PartiallyInlineLibCalls.h +++ b/include/llvm/Transforms/Scalar/PartiallyInlineLibCalls.h @@ -23,7 +23,7 @@ namespace llvm { class PartiallyInlineLibCallsPass : public PassInfoMixin<PartiallyInlineLibCallsPass> { public: - PreservedAnalyses run(Function &F, AnalysisManager<Function> &AM); + PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM); }; } diff --git a/include/llvm/Transforms/Scalar/SCCP.h b/include/llvm/Transforms/Scalar/SCCP.h index 0dd90ecbede..6e7f77fe2c5 100644 --- a/include/llvm/Transforms/Scalar/SCCP.h +++ b/include/llvm/Transforms/Scalar/SCCP.h @@ -29,7 +29,7 @@ namespace llvm { /// This pass performs function-level constant propagation and merging. class SCCPPass : public PassInfoMixin<SCCPPass> { public: - PreservedAnalyses run(Function &F, AnalysisManager<Function> &AM); + PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM); }; } diff --git a/include/llvm/Transforms/Scalar/SROA.h b/include/llvm/Transforms/Scalar/SROA.h index 72e7d63d4df..3e93f46dd4e 100644 --- a/include/llvm/Transforms/Scalar/SROA.h +++ b/include/llvm/Transforms/Scalar/SROA.h @@ -102,7 +102,7 @@ public: SROA() : C(nullptr), DT(nullptr), AC(nullptr) {} /// \brief Run the pass over the function. - PreservedAnalyses run(Function &F, AnalysisManager<Function> &AM); + PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM); private: friend class sroa::AllocaSliceRewriter; diff --git a/include/llvm/Transforms/Scalar/SimplifyCFG.h b/include/llvm/Transforms/Scalar/SimplifyCFG.h index 53f427a7d19..96e1658c00b 100644 --- a/include/llvm/Transforms/Scalar/SimplifyCFG.h +++ b/include/llvm/Transforms/Scalar/SimplifyCFG.h @@ -36,7 +36,7 @@ public: SimplifyCFGPass(int BonusInstThreshold); /// \brief Run the pass over the function. - PreservedAnalyses run(Function &F, AnalysisManager<Function> &AM); + PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM); }; } diff --git a/include/llvm/Transforms/Scalar/Sink.h b/include/llvm/Transforms/Scalar/Sink.h index 1144c62fb20..f9b3cb0fae3 100644 --- a/include/llvm/Transforms/Scalar/Sink.h +++ b/include/llvm/Transforms/Scalar/Sink.h @@ -23,7 +23,7 @@ namespace llvm { /// Move instructions into successor blocks when possible. class SinkingPass : public PassInfoMixin<SinkingPass> { public: - PreservedAnalyses run(Function &F, AnalysisManager<Function> &AM); + PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM); }; } diff --git a/include/llvm/Transforms/Utils/AddDiscriminators.h b/include/llvm/Transforms/Utils/AddDiscriminators.h index 0b3a8add627..a8775830099 100644 --- a/include/llvm/Transforms/Utils/AddDiscriminators.h +++ b/include/llvm/Transforms/Utils/AddDiscriminators.h @@ -22,7 +22,7 @@ namespace llvm { class AddDiscriminatorsPass : public PassInfoMixin<AddDiscriminatorsPass> { public: - PreservedAnalyses run(Function &F, AnalysisManager<Function> &AM); + PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM); }; } // end namespace llvm diff --git a/include/llvm/Transforms/Utils/LCSSA.h b/include/llvm/Transforms/Utils/LCSSA.h index f0277d02154..fe717e5f663 100644 --- a/include/llvm/Transforms/Utils/LCSSA.h +++ b/include/llvm/Transforms/Utils/LCSSA.h @@ -37,7 +37,7 @@ namespace llvm { /// Converts loops into loop-closed SSA form. class LCSSAPass : public PassInfoMixin<LCSSAPass> { public: - PreservedAnalyses run(Function &F, AnalysisManager<Function> &AM); + PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM); }; } // end namespace llvm diff --git a/include/llvm/Transforms/Utils/LoopSimplify.h b/include/llvm/Transforms/Utils/LoopSimplify.h index 7cf89eaeb93..f3828bc16e2 100644 --- a/include/llvm/Transforms/Utils/LoopSimplify.h +++ b/include/llvm/Transforms/Utils/LoopSimplify.h @@ -49,7 +49,7 @@ namespace llvm { /// This pass is responsible for loop canonicalization. class LoopSimplifyPass : public PassInfoMixin<LoopSimplifyPass> { public: - PreservedAnalyses run(Function &F, AnalysisManager<Function> &AM); + PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM); }; /// \brief Simplify each loop in a loop nest recursively. diff --git a/include/llvm/Transforms/Utils/Mem2Reg.h b/include/llvm/Transforms/Utils/Mem2Reg.h index f3c80edf544..456876b520b 100644 --- a/include/llvm/Transforms/Utils/Mem2Reg.h +++ b/include/llvm/Transforms/Utils/Mem2Reg.h @@ -21,7 +21,7 @@ namespace llvm { class PromotePass : public PassInfoMixin<PromotePass> { public: - PreservedAnalyses run(Function &F, AnalysisManager<Function> &AM); + PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM); }; } diff --git a/include/llvm/Transforms/Utils/MemorySSA.h b/include/llvm/Transforms/Utils/MemorySSA.h index cf065b25ac9..2caa63feec6 100644 --- a/include/llvm/Transforms/Utils/MemorySSA.h +++ b/include/llvm/Transforms/Utils/MemorySSA.h @@ -689,7 +689,7 @@ public: std::unique_ptr<MemorySSA> MSSA; }; - Result run(Function &F, AnalysisManager<Function> &AM); + Result run(Function &F, FunctionAnalysisManager &AM); }; /// \brief Printer pass for \c MemorySSA. @@ -698,12 +698,12 @@ class MemorySSAPrinterPass : public PassInfoMixin<MemorySSAPrinterPass> { public: explicit MemorySSAPrinterPass(raw_ostream &OS) : OS(OS) {} - PreservedAnalyses run(Function &F, AnalysisManager<Function> &AM); + PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM); }; /// \brief Verifier pass for \c MemorySSA. struct MemorySSAVerifierPass : PassInfoMixin<MemorySSAVerifierPass> { - PreservedAnalyses run(Function &F, AnalysisManager<Function> &AM); + PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM); }; /// \brief Legacy analysis pass which computes \c MemorySSA. diff --git a/include/llvm/Transforms/Utils/SimplifyInstructions.h b/include/llvm/Transforms/Utils/SimplifyInstructions.h index ea491dc5058..3f838611626 100644 --- a/include/llvm/Transforms/Utils/SimplifyInstructions.h +++ b/include/llvm/Transforms/Utils/SimplifyInstructions.h @@ -24,7 +24,7 @@ namespace llvm { /// This pass removes redundant instructions. class InstSimplifierPass : public PassInfoMixin<InstSimplifierPass> { public: - PreservedAnalyses run(Function &F, AnalysisManager<Function> &AM); + PreservedAnalyses run(Function &F, FunctionAnalysisManager &AM); }; } // end namespace llvm diff --git a/lib/Analysis/AliasAnalysisEvaluator.cpp b/lib/Analysis/AliasAnalysisEvaluator.cpp index baf8f3f881d..4d6a6c9a30a 100644 --- a/lib/Analysis/AliasAnalysisEvaluator.cpp +++ b/lib/Analysis/AliasAnalysisEvaluator.cpp @@ -88,7 +88,7 @@ static inline bool isInterestingPointer(Value *V) { && !isa<ConstantPointerNull>(V); } -PreservedAnalyses AAEvaluator::run(Function &F, AnalysisManager<Function> &AM) { +PreservedAnalyses AAEvaluator::run(Function &F, FunctionAnalysisManager &AM) { runInternal(F, AM.getResult<AAManager>(F)); return PreservedAnalyses::all(); } diff --git a/lib/Analysis/AssumptionCache.cpp b/lib/Analysis/AssumptionCache.cpp index ca71644757f..42a3d41cdd2 100644 --- a/lib/Analysis/AssumptionCache.cpp +++ b/lib/Analysis/AssumptionCache.cpp @@ -77,7 +77,7 @@ void AssumptionCache::registerAssumption(CallInst *CI) { char AssumptionAnalysis::PassID; PreservedAnalyses AssumptionPrinterPass::run(Function &F, - AnalysisManager<Function> &AM) { + FunctionAnalysisManager &AM) { AssumptionCache &AC = AM.getResult<AssumptionAnalysis>(F); OS << "Cached assumptions for function: " << F.getName() << "\n"; diff --git a/lib/Analysis/BasicAliasAnalysis.cpp b/lib/Analysis/BasicAliasAnalysis.cpp index 43d5c3ccf90..89ae3d0ecce 100644 --- a/lib/Analysis/BasicAliasAnalysis.cpp +++ b/lib/Analysis/BasicAliasAnalysis.cpp @@ -1669,7 +1669,7 @@ bool BasicAAResult::constantOffsetHeuristic( char BasicAA::PassID; -BasicAAResult BasicAA::run(Function &F, AnalysisManager<Function> &AM) { +BasicAAResult BasicAA::run(Function &F, FunctionAnalysisManager &AM) { return BasicAAResult(F.getParent()->getDataLayout(), AM.getResult<TargetLibraryAnalysis>(F), AM.getResult<AssumptionAnalysis>(F), diff --git a/lib/Analysis/BlockFrequencyInfo.cpp b/lib/Analysis/BlockFrequencyInfo.cpp index 5f7060aaa61..4fef855398e 100644 --- a/lib/Analysis/BlockFrequencyInfo.cpp +++ b/lib/Analysis/BlockFrequencyInfo.cpp @@ -257,7 +257,7 @@ bool BlockFrequencyInfoWrapperPass::runOnFunction(Function &F) { char BlockFrequencyAnalysis::PassID; BlockFrequencyInfo BlockFrequencyAnalysis::run(Function &F, - AnalysisManager<Function> &AM) { + FunctionAnalysisManager &AM) { BlockFrequencyInfo BFI; BFI.calculate(F, AM.getResult<BranchProbabilityAnalysis>(F), AM.getResult<LoopAnalysis>(F)); @@ -265,7 +265,7 @@ BlockFrequencyInfo BlockFrequencyAnalysis::run(Function &F, } PreservedAnalyses -BlockFrequencyPrinterPass::run(Function &F, AnalysisManager<Function> &AM) { +BlockFrequencyPrinterPass::run(Function &F, FunctionAnalysisManager &AM) { OS << "Printing analysis results of BFI for function " << "'" << F.getName() << "':" << "\n"; diff --git a/lib/Analysis/BranchProbabilityInfo.cpp b/lib/Analysis/BranchProbabilityInfo.cpp index d802552d4e2..bf02653b492 100644 --- a/lib/Analysis/BranchProbabilityInfo.cpp +++ b/lib/Analysis/BranchProbabilityInfo.cpp @@ -703,14 +703,14 @@ void BranchProbabilityInfoWrapperPass::print(raw_ostream &OS, char BranchProbabilityAnalysis::PassID; BranchProbabilityInfo -BranchProbabilityAnalysis::run(Function &F, AnalysisManager<Function> &AM) { +BranchProbabilityAnalysis::run(Function &F, FunctionAnalysisManager &AM) { BranchProbabilityInfo BPI; BPI.calculate(F, AM.getResult<LoopAnalysis>(F)); return BPI; } PreservedAnalyses -BranchProbabilityPrinterPass::run(Function &F, AnalysisManager<Function> &AM) { +BranchProbabilityPrinterPass::run(Function &F, FunctionAnalysisManager &AM) { OS << "Printing analysis results of BPI for function " << "'" << F.getName() << "':" << "\n"; diff --git a/lib/Analysis/CFLAndersAliasAnalysis.cpp b/lib/Analysis/CFLAndersAliasAnalysis.cpp index 354035e63d3..d85121283cc 100644 --- a/lib/Analysis/CFLAndersAliasAnalysis.cpp +++ b/lib/Analysis/CFLAndersAliasAnalysis.cpp @@ -869,7 +869,7 @@ AliasResult CFLAndersAAResult::alias(const MemoryLocation &LocA, char CFLAndersAA::PassID; -CFLAndersAAResult CFLAndersAA::run(Function &F, AnalysisManager<Function> &AM) { +CFLAndersAAResult CFLAndersAA::run(Function &F, FunctionAnalysisManager &AM) { return CFLAndersAAResult(AM.getResult<TargetLibraryAnalysis>(F)); } diff --git a/lib/Analysis/CFLSteensAliasAnalysis.cpp b/lib/Analysis/CFLSteensAliasAnalysis.cpp index fef397f3b25..e55d3e949a1 100644 --- a/lib/Analysis/CFLSteensAliasAnalysis.cpp +++ b/lib/Analysis/CFLSteensAliasAnalysis.cpp @@ -343,7 +343,7 @@ AliasResult CFLSteensAAResult::query(const MemoryLocation &LocA, char CFLSteensAA::PassID; -CFLSteensAAResult CFLSteensAA::run(Function &F, AnalysisManager<Function> &AM) { +CFLSteensAAResult CFLSteensAA::run(Function &F, FunctionAnalysisManager &AM) { return CFLSteensAAResult(AM.getResult<TargetLibraryAnalysis>(F)); } diff --git a/lib/Analysis/DemandedBits.cpp b/lib/Analysis/DemandedBits.cpp index ee9f2c7ddb5..106ccbecf8a 100644 --- a/lib/Analysis/DemandedBits.cpp +++ b/lib/Analysis/DemandedBits.cpp @@ -389,7 +389,7 @@ FunctionPass *llvm::createDemandedBitsWrapperPass() { char DemandedBitsAnalysis::PassID; DemandedBits DemandedBitsAnalysis::run(Function &F, - AnalysisManager<Function> &AM) { + FunctionAnalysisManager &AM) { auto &AC = AM.getResult<AssumptionAnalysis>(F); auto &DT = AM.getResult<DominatorTreeAnalysis>(F); return DemandedBits(F, AC, DT); diff --git a/lib/Analysis/LoopAccessAnalysis.cpp b/lib/Analysis/LoopAccessAnalysis.cpp index e54ac0650ac..8f24cffef75 100644 --- a/lib/Analysis/LoopAccessAnalysis.cpp +++ b/lib/Analysis/LoopAccessAnalysis.cpp @@ -2031,7 +2031,7 @@ INITIALIZE_PASS_END(LoopAccessLegacyAnalysis, LAA_NAME, laa_name, false, true) char LoopAccessAnalysis::PassID; LoopAccessInfo LoopAccessAnalysis::run(Loop &L, AnalysisManager<Loop> &AM) { - const AnalysisManager<Function> &FAM = + const FunctionAnalysisManager &FAM = AM.getResult<FunctionAnalysisManagerLoopProxy>(L).getManager(); Function &F = *L.getHeader()->getParent(); auto *SE = FAM.getCachedResult<ScalarEvolutionAnalysis>(F); diff --git a/lib/Analysis/LoopInfo.cpp b/lib/Analysis/LoopInfo.cpp index cbd5edec917..9a8789cfe55 100644 --- a/lib/Analysis/LoopInfo.cpp +++ b/lib/Analysis/LoopInfo.cpp @@ -651,7 +651,7 @@ void LoopInfo::markAsRemoved(Loop *Unloop) { char LoopAnalysis::PassID; -LoopInfo LoopAnalysis::run(Function &F, AnalysisManager<Function> &AM) { +LoopInfo LoopAnalysis::run(Function &F, FunctionAnalysisManager &AM) { // FIXME: Currently we create a LoopInfo from scratch for every function. // This may prove to be too wasteful due to deallocating and re-allocating // memory each time for the underlying map and vector datastructures. At some @@ -664,7 +664,7 @@ LoopInfo LoopAnalysis::run(Function &F, AnalysisManager<Function> &AM) { } PreservedAnalyses LoopPrinterPass::run(Function &F, - AnalysisManager<Function> &AM) { + FunctionAnalysisManager &AM) { AM.getResult<LoopAnalysis>(F).print(OS); return PreservedAnalyses::all(); } @@ -720,7 +720,7 @@ void LoopInfoWrapperPass::print(raw_ostream &OS, const Module *) const { } PreservedAnalyses LoopVerifierPass::run(Function &F, - AnalysisManager<Function> &AM) { + FunctionAnalysisManager &AM) { LoopInfo &LI = AM.getResult<LoopAnalysis>(F); LI.verify(); return PreservedAnalyses::all(); diff --git a/lib/Analysis/MemoryDependenceAnalysis.cpp b/lib/Analysis/MemoryDependenceAnalysis.cpp index 33499334fef..894b27b5462 100644 --- a/lib/Analysis/MemoryDependenceAnalysis.cpp +++ b/lib/Analysis/MemoryDependenceAnalysis.cpp @@ -1662,7 +1662,7 @@ void MemoryDependenceResults::verifyRemoved(Instruction *D) const { char MemoryDependenceAnalysis::PassID; MemoryDependenceResults -MemoryDependenceAnalysis::run(Function &F, AnalysisManager<Function> &AM) { +MemoryDependenceAnalysis::run(Function &F, FunctionAnalysisManager &AM) { auto &AA = AM.getResult<AAManager>(F); auto &AC = AM.getResult<AssumptionAnalysis>(F); auto &TLI = AM.getResult<TargetLibraryAnalysis>(F); diff --git a/lib/Analysis/ObjCARCAliasAnalysis.cpp b/lib/Analysis/ObjCARCAliasAnalysis.cpp index 9bb1048ea8b..ed03406ca8c 100644 --- a/lib/Analysis/ObjCARCAliasAnalysis.cpp +++ b/lib/Analysis/ObjCARCAliasAnalysis.cpp @@ -131,7 +131,7 @@ ModRefInfo ObjCARCAAResult::getModRefInfo(ImmutableCallSite CS, return AAResultBase::getModRefInfo(CS, Loc); } -ObjCARCAAResult ObjCARCAA::run(Function &F, AnalysisManager<Function> &AM) { +ObjCARCAAResult ObjCARCAA::run(Function &F, FunctionAnalysisManager &AM) { return ObjCARCAAResult(F.getParent()->getDataLayout()); } diff --git a/lib/Analysis/OptimizationDiagnosticInfo.cpp b/lib/Analysis/OptimizationDiagnosticInfo.cpp index 94c796d4898..5256437da9d 100644 --- a/lib/Analysis/OptimizationDiagnosticInfo.cpp +++ b/lib/Analysis/OptimizationDiagnosticInfo.cpp @@ -119,7 +119,7 @@ char OptimizationRemarkEmitterAnalysis::PassID; OptimizationRemarkEmitter OptimizationRemarkEmitterAnalysis::run(Function &F, - AnalysisManager<Function> &AM) { + FunctionAnalysisManager &AM) { BlockFrequencyInfo *BFI; if (F.getContext().getDiagnosticHotnessRequested()) diff --git a/lib/Analysis/RegionInfo.cpp b/lib/Analysis/RegionInfo.cpp index 6860a3e6395..517cf700d1e 100644 --- a/lib/Analysis/RegionInfo.cpp +++ b/lib/Analysis/RegionInfo.cpp @@ -184,7 +184,7 @@ namespace llvm { char RegionInfoAnalysis::PassID; -RegionInfo RegionInfoAnalysis::run(Function &F, AnalysisManager<Function> &AM) { +RegionInfo RegionInfoAnalysis::run(Function &F, FunctionAnalysisManager &AM) { RegionInfo RI; auto *DT = &AM.getResult<DominatorTreeAnalysis>(F); auto *PDT = &AM.getResult<PostDominatorTreeAnalysis>(F); @@ -206,7 +206,7 @@ PreservedAnalyses RegionInfoPrinterPass::run(Function &F, } PreservedAnalyses RegionInfoVerifierPass::run(Function &F, - AnalysisManager<Function> &AM) { + FunctionAnalysisManager &AM) { AM.getResult<RegionInfoAnalysis>(F).verifyAnalysis(); return PreservedAnalyses::all(); diff --git a/lib/Analysis/ScalarEvolution.cpp b/lib/Analysis/ScalarEvolution.cpp index d3d85b1b399..6a07e33f593 100644 --- a/lib/Analysis/ScalarEvolution.cpp +++ b/lib/Analysis/ScalarEvolution.cpp @@ -9999,7 +9999,7 @@ void ScalarEvolution::verify() const { char ScalarEvolutionAnalysis::PassID; ScalarEvolution ScalarEvolutionAnalysis::run(Function &F, - AnalysisManager<Function> &AM) { + FunctionAnalysisManager &AM) { return ScalarEvolution(F, AM.getResult<TargetLibraryAnalysis>(F), AM.getResult<AssumptionAnalysis>(F), AM.getResult<DominatorTreeAnalysis>(F), @@ -10007,7 +10007,7 @@ ScalarEvolution ScalarEvolutionAnalysis::run(Function &F, } PreservedAnalyses -ScalarEvolutionPrinterPass::run(Function &F, AnalysisManager<Function> &AM) { +ScalarEvolutionPrinterPass::run(Function &F, FunctionAnalysisManager &AM) { AM.getResult<ScalarEvolutionAnalysis>(F).print(OS); return PreservedAnalyses::all(); } diff --git a/lib/Analysis/ScalarEvolutionAliasAnalysis.cpp b/lib/Analysis/ScalarEvolutionAliasAnalysis.cpp index 61fb411d315..f15b1787f00 100644 --- a/lib/Analysis/ScalarEvolutionAliasAnalysis.cpp +++ b/lib/Analysis/ScalarEvolutionAliasAnalysis.cpp @@ -112,7 +112,7 @@ Value *SCEVAAResult::GetBaseValue(const SCEV *S) { char SCEVAA::PassID; -SCEVAAResult SCEVAA::run(Function &F, AnalysisManager<Function> &AM) { +SCEVAAResult SCEVAA::run(Function &F, FunctionAnalysisManager &AM) { return SCEVAAResult(AM.getResult<ScalarEvolutionAnalysis>(F)); } diff --git a/lib/Analysis/ScopedNoAliasAA.cpp b/lib/Analysis/ScopedNoAliasAA.cpp index 82e65a1f208..1c4d0fa94bf 100644 --- a/lib/Analysis/ScopedNoAliasAA.cpp +++ b/lib/Analysis/ScopedNoAliasAA.cpp @@ -175,7 +175,7 @@ bool ScopedNoAliasAAResult::mayAliasInScopes(const MDNode *Scopes, char ScopedNoAliasAA::PassID; ScopedNoAliasAAResult ScopedNoAliasAA::run(Function &F, - AnalysisManager<Function> &AM) { + FunctionAnalysisManager &AM) { return ScopedNoAliasAAResult(); } diff --git a/lib/Analysis/TargetTransformInfo.cpp b/lib/Analysis/TargetTransformInfo.cpp index c4aea355a3d..383d602f51d 100644 --- a/lib/Analysis/TargetTransformInfo.cpp +++ b/lib/Analysis/TargetTransformInfo.cpp @@ -427,7 +427,7 @@ TargetIRAnalysis::TargetIRAnalysis( : TTICallback(std::move(TTICallback)) {} TargetIRAnalysis::Result TargetIRAnalysis::run(const Function &F, - AnalysisManager<Function> &) { + FunctionAnalysisManager &) { return TTICallback(F); } @@ -458,7 +458,7 @@ TargetTransformInfoWrapperPass::TargetTransformInfoWrapperPass( } TargetTransformInfo &TargetTransformInfoWrapperPass::getTTI(const Function &F) { - AnalysisManager<Function> DummyFAM; + FunctionAnalysisManager DummyFAM; TTI = TIRA.run(F, DummyFAM); return *TTI; } diff --git a/lib/Analysis/TypeBasedAliasAnalysis.cpp b/lib/Analysis/TypeBasedAliasAnalysis.cpp index 20d162a03c3..bd2b05c463f 100644 --- a/lib/Analysis/TypeBasedAliasAnalysis.cpp +++ b/lib/Analysis/TypeBasedAliasAnalysis.cpp @@ -585,7 +585,7 @@ bool TypeBasedAAResult::PathAliases(const MDNode *A, const MDNode *B) const { char TypeBasedAA::PassID; -TypeBasedAAResult TypeBasedAA::run(Function &F, AnalysisManager<Function> &AM) { +TypeBasedAAResult TypeBasedAA::run(Function &F, FunctionAnalysisManager &AM) { return TypeBasedAAResult(); } diff --git a/lib/IR/Dominators.cpp b/lib/IR/Dominators.cpp index 57e3df76d02..5c3a2de95c5 100644 --- a/lib/IR/Dominators.cpp +++ b/lib/IR/Dominators.cpp @@ -301,7 +301,7 @@ void DominatorTree::verifyDomTree() const { //===----------------------------------------------------------------------===// DominatorTree DominatorTreeAnalysis::run(Function &F, - AnalysisManager<Function> &) { + FunctionAnalysisManager &) { DominatorTree DT; DT.recalculate(F); return DT; diff --git a/lib/IR/IRPrintingPasses.cpp b/lib/IR/IRPrintingPasses.cpp index 4d2f9b98911..4ee4f1f5ac8 100644 --- a/lib/IR/IRPrintingPasses.cpp +++ b/lib/IR/IRPrintingPasses.cpp @@ -43,7 +43,7 @@ PrintFunctionPass::PrintFunctionPass(raw_ostream &OS, const std::string &Banner) : OS(OS), Banner(Banner) {} PreservedAnalyses PrintFunctionPass::run(Function &F, - AnalysisManager<Function> &) { + FunctionAnalysisManager &) { if (isFunctionInPrintList(F.getName())) OS << Banner << static_cast<Value &>(F); return PreservedAnalyses::all(); diff --git a/lib/Passes/PassBuilder.cpp b/lib/Passes/PassBuilder.cpp index e7d33a2bd45..ddddbc190e8 100644 --- a/lib/Passes/PassBuilder.cpp +++ b/lib/Passes/PassBuilder.cpp @@ -176,7 +176,7 @@ public: /// \brief No-op function pass which does nothing. struct NoOpFunctionPass { - PreservedAnalyses run(Function &F, AnalysisManager<Function> &) { + PreservedAnalyses run(Function &F, FunctionAnalysisManager &) { return PreservedAnalyses::all(); } static StringRef name() { return "NoOpFunctionPass"; } @@ -189,7 +189,7 @@ class NoOpFunctionAnalysis : public AnalysisInfoMixin<NoOpFunctionAnalysis> { public: struct Result {}; - Result run(Function &, AnalysisManager<Function> &) { return Result(); } + Result run(Function &, FunctionAnalysisManager &) { return Result(); } static StringRef name() { return "NoOpFunctionAnalysis"; } }; diff --git a/lib/Transforms/InstCombine/InstructionCombining.cpp b/lib/Transforms/InstCombine/InstructionCombining.cpp index 5ee4c45b30e..2dab5b6d628 100644 --- a/lib/Transforms/InstCombine/InstructionCombining.cpp +++ b/lib/Transforms/InstCombine/InstructionCombining.cpp @@ -3173,7 +3173,7 @@ combineInstructionsOverFunction(Function &F, InstCombineWorklist &Worklist, } PreservedAnalyses InstCombinePass::run(Function &F, - AnalysisManager<Function> &AM) { + FunctionAnalysisManager &AM) { auto &AC = AM.getResult<AssumptionAnalysis>(F); auto &DT = AM.getResult<DominatorTreeAnalysis>(F); auto &TLI = AM.getResult<TargetLibraryAnalysis>(F); diff --git a/lib/Transforms/Scalar/DCE.cpp b/lib/Transforms/Scalar/DCE.cpp index f73809d9f04..cc2a3cfaf9d 100644 --- a/lib/Transforms/Scalar/DCE.cpp +++ b/lib/Transforms/Scalar/DCE.cpp @@ -123,7 +123,7 @@ static bool eliminateDeadCode(Function &F, TargetLibraryInfo *TLI) { return MadeChange; } -PreservedAnalyses DCEPass::run(Function &F, AnalysisManager<Function> &AM) { +PreservedAnalyses DCEPass::run(Function &F, FunctionAnalysisManager &AM) { if (eliminateDeadCode(F, AM.getCachedResult<TargetLibraryAnalysis>(F))) return PreservedAnalyses::none(); return PreservedAnalyses::all(); diff --git a/lib/Transforms/Scalar/EarlyCSE.cpp b/lib/Transforms/Scalar/EarlyCSE.cpp index 0b16e2703dc..6376aae5cbd 100644 --- a/lib/Transforms/Scalar/EarlyCSE.cpp +++ b/lib/Transforms/Scalar/EarlyCSE.cpp @@ -847,7 +847,7 @@ bool EarlyCSE::run() { } PreservedAnalyses EarlyCSEPass::run(Function &F, - AnalysisManager<Function> &AM) { + FunctionAnalysisManager &AM) { auto &TLI = AM.getResult<TargetLibraryAnalysis>(F); auto &TTI = AM.getResult<TargetIRAnalysis>(F); auto &DT = AM.getResult<DominatorTreeAnalysis>(F); diff --git a/lib/Transforms/Scalar/GVN.cpp b/lib/Transforms/Scalar/GVN.cpp index 6f2ce243f5f..a108ce8d292 100644 --- a/lib/Transforms/Scalar/GVN.cpp +++ b/lib/Transforms/Scalar/GVN.cpp @@ -583,7 +583,7 @@ void GVN::ValueTable::verifyRemoved(const Value *V) const { // GVN Pass //===----------------------------------------------------------------------===// -PreservedAnalyses GVN::run(Function &F, AnalysisManager<Function> &AM) { +PreservedAnalyses GVN::run(Function &F, FunctionAnalysisManager &AM) { // FIXME: The order of evaluation of these 'getResult' calls is very // significant! Re-ordering these variables will cause GVN when run alone to // be less effective! We should fix memdep and basic-aa to not exhibit this diff --git a/lib/Transforms/Scalar/GVNHoist.cpp b/lib/Transforms/Scalar/GVNHoist.cpp index c734dfced8e..63f00256248 100644 --- a/lib/Transforms/Scalar/GVNHoist.cpp +++ b/lib/Transforms/Scalar/GVNHoist.cpp @@ -940,7 +940,7 @@ public: } // namespace PreservedAnalyses GVNHoistPass::run(Function &F, - AnalysisManager<Function> &AM) { + FunctionAnalysisManager &AM) { DominatorTree &DT = AM.getResult<DominatorTreeAnalysis>(F); AliasAnalysis &AA = AM.getResult<AAManager>(F); MemoryDependenceResults &MD = AM.getResult<MemoryDependenceAnalysis>(F); diff --git a/lib/Transforms/Scalar/GuardWidening.cpp b/lib/Transforms/Scalar/GuardWidening.cpp index 7686e65efed..d15fe21ce22 100644 --- a/lib/Transforms/Scalar/GuardWidening.cpp +++ b/lib/Transforms/Scalar/GuardWidening.cpp @@ -653,7 +653,7 @@ bool GuardWideningImpl::combineRangeChecks( } PreservedAnalyses GuardWideningPass::run(Function &F, - AnalysisManager<Function> &AM) { + FunctionAnalysisManager &AM) { auto &DT = AM.getResult<DominatorTreeAnalysis>(F); auto &LI = AM.getResult<LoopAnalysis>(F); auto &PDT = AM.getResult<PostDominatorTreeAnalysis>(F); diff --git a/lib/Transforms/Scalar/JumpThreading.cpp b/lib/Transforms/Scalar/JumpThreading.cpp index 4093cc57dfc..77ec5964f9e 100644 --- a/lib/Transforms/Scalar/JumpThreading.cpp +++ b/lib/Transforms/Scalar/JumpThreading.cpp @@ -134,7 +134,7 @@ bool JumpThreading::runOnFunction(Function &F) { } PreservedAnalyses JumpThreadingPass::run(Function &F, - AnalysisManager<Function> &AM) { + FunctionAnalysisManager &AM) { auto &TLI = AM.getResult<TargetLibraryAnalysis>(F); auto &LVI = AM.getResult<LazyValueAnalysis>(F); diff --git a/lib/Transforms/Scalar/MergedLoadStoreMotion.cpp b/lib/Transforms/Scalar/MergedLoadStoreMotion.cpp index 241c81e9fca..ccdb3774539 100644 --- a/lib/Transforms/Scalar/MergedLoadStoreMotion.cpp +++ b/lib/Transforms/Scalar/MergedLoadStoreMotion.cpp @@ -589,7 +589,7 @@ INITIALIZE_PASS_END(MergedLoadStoreMotionLegacyPass, "mldst-motion", "MergedLoadStoreMotion", false, false) PreservedAnalyses -MergedLoadStoreMotionPass::run(Function &F, AnalysisManager<Function> &AM) { +MergedLoadStoreMotionPass::run(Function &F, FunctionAnalysisManager &AM) { MergedLoadStoreMotion Impl; auto *MD = AM.getCachedResult<MemoryDependenceAnalysis>(F); auto &AA = AM.getResult<AAManager>(F); diff --git a/lib/Transforms/Scalar/PartiallyInlineLibCalls.cpp b/lib/Transforms/Scalar/PartiallyInlineLibCalls.cpp index c4b3e3464f4..1a7ddc9585b 100644 --- a/lib/Transforms/Scalar/PartiallyInlineLibCalls.cpp +++ b/lib/Transforms/Scalar/PartiallyInlineLibCalls.cpp @@ -123,7 +123,7 @@ static bool runPartiallyInlineLibCalls(Function &F, TargetLibraryInfo *TLI, } PreservedAnalyses -PartiallyInlineLibCallsPass::run(Function &F, AnalysisManager<Function> &AM) { +PartiallyInlineLibCallsPass::run(Function &F, FunctionAnalysisManager &AM) { auto &TLI = AM.getResult<TargetLibraryAnalysis>(F); auto &TTI = AM.getResult<TargetIRAnalysis>(F); if (!runPartiallyInlineLibCalls(F, &TLI, &TTI)) diff --git a/lib/Transforms/Scalar/SCCP.cpp b/lib/Transforms/Scalar/SCCP.cpp index 355009176d8..928a1780724 100644 --- a/lib/Transforms/Scalar/SCCP.cpp +++ b/lib/Transforms/Scalar/SCCP.cpp @@ -1631,7 +1631,7 @@ static bool runSCCP(Function &F, const DataLayout &DL, return MadeChanges; } -PreservedAnalyses SCCPPass::run(Function &F, AnalysisManager<Function> &AM) { +PreservedAnalyses SCCPPass::run(Function &F, FunctionAnalysisManager &AM) { const DataLayout &DL = F.getParent()->getDataLayout(); auto &TLI = AM.getResult<TargetLibraryAnalysis>(F); if (!runSCCP(F, DL, &TLI)) diff --git a/lib/Transforms/Scalar/SROA.cpp b/lib/Transforms/Scalar/SROA.cpp index 67d90a346f2..9a29eaddbab 100644 --- a/lib/Transforms/Scalar/SROA.cpp +++ b/lib/Transforms/Scalar/SROA.cpp @@ -4253,7 +4253,7 @@ PreservedAnalyses SROA::runImpl(Function &F, DominatorTree &RunDT, return PA; } -PreservedAnalyses SROA::run(Function &F, AnalysisManager<Function> &AM) { +PreservedAnalyses SROA::run(Function &F, FunctionAnalysisManager &AM) { return runImpl(F, AM.getResult<DominatorTreeAnalysis>(F), AM.getResult<AssumptionAnalysis>(F)); } diff --git a/lib/Transforms/Scalar/SimplifyCFGPass.cpp b/lib/Transforms/Scalar/SimplifyCFGPass.cpp index 2d0a21d2c51..f2723bd7af8 100644 --- a/lib/Transforms/Scalar/SimplifyCFGPass.cpp +++ b/lib/Transforms/Scalar/SimplifyCFGPass.cpp @@ -187,7 +187,7 @@ SimplifyCFGPass::SimplifyCFGPass(int BonusInstThreshold) : BonusInstThreshold(BonusInstThreshold) {} PreservedAnalyses SimplifyCFGPass::run(Function &F, - AnalysisManager<Function> &AM) { + FunctionAnalysisManager &AM) { auto &TTI = AM.getResult<TargetIRAnalysis>(F); auto &AC = AM.getResult<AssumptionAnalysis>(F); diff --git a/lib/Transforms/Scalar/Sink.cpp b/lib/Transforms/Scalar/Sink.cpp index d9a296c6312..c3f14a0f4b1 100644 --- a/lib/Transforms/Scalar/Sink.cpp +++ b/lib/Transforms/Scalar/Sink.cpp @@ -254,7 +254,7 @@ static bool iterativelySinkInstructions(Function &F, DominatorTree &DT, return EverMadeChange; } -PreservedAnalyses SinkingPass::run(Function &F, AnalysisManager<Function> &AM) { +PreservedAnalyses SinkingPass::run(Function &F, FunctionAnalysisManager &AM) { auto &DT = AM.getResult<DominatorTreeAnalysis>(F); auto &LI = AM.getResult<LoopAnalysis>(F); auto &AA = AM.getResult<AAManager>(F); diff --git a/lib/Transforms/Utils/AddDiscriminators.cpp b/lib/Transforms/Utils/AddDiscriminators.cpp index 8b9409f29cb..ee409220b46 100644 --- a/lib/Transforms/Utils/AddDiscriminators.cpp +++ b/lib/Transforms/Utils/AddDiscriminators.cpp @@ -249,7 +249,7 @@ bool AddDiscriminatorsLegacyPass::runOnFunction(Function &F) { return addDiscriminators(F); } PreservedAnalyses AddDiscriminatorsPass::run(Function &F, - AnalysisManager<Function> &AM) { + FunctionAnalysisManager &AM) { if (!addDiscriminators(F)) return PreservedAnalyses::all(); diff --git a/lib/Transforms/Utils/LCSSA.cpp b/lib/Transforms/Utils/LCSSA.cpp index 1c8990fcc78..8071df6633d 100644 --- a/lib/Transforms/Utils/LCSSA.cpp +++ b/lib/Transforms/Utils/LCSSA.cpp @@ -360,7 +360,7 @@ bool LCSSAWrapperPass::runOnFunction(Function &F) { return formLCSSAOnAllLoops(LI, *DT, SE); } -PreservedAnalyses LCSSAPass::run(Function &F, AnalysisManager<Function> &AM) { +PreservedAnalyses LCSSAPass::run(Function &F, FunctionAnalysisManager &AM) { auto &LI = AM.getResult<LoopAnalysis>(F); auto &DT = AM.getResult<DominatorTreeAnalysis>(F); auto *SE = AM.getCachedResult<ScalarEvolutionAnalysis>(F); diff --git a/lib/Transforms/Utils/LoopSimplify.cpp b/lib/Transforms/Utils/LoopSimplify.cpp index 5b21ad61c62..d2ccb162a70 100644 --- a/lib/Transforms/Utils/LoopSimplify.cpp +++ b/lib/Transforms/Utils/LoopSimplify.cpp @@ -857,7 +857,7 @@ bool LoopSimplify::runOnFunction(Function &F) { } PreservedAnalyses LoopSimplifyPass::run(Function &F, - AnalysisManager<Function> &AM) { + FunctionAnalysisManager &AM) { bool Changed = false; LoopInfo *LI = &AM.getResult<LoopAnalysis>(F); DominatorTree *DT = &AM.getResult<DominatorTreeAnalysis>(F); diff --git a/lib/Transforms/Utils/Mem2Reg.cpp b/lib/Transforms/Utils/Mem2Reg.cpp index 1419254bcb4..24b3b12930a 100644 --- a/lib/Transforms/Utils/Mem2Reg.cpp +++ b/lib/Transforms/Utils/Mem2Reg.cpp @@ -53,7 +53,7 @@ static bool promoteMemoryToRegister(Function &F, DominatorTree &DT, return Changed; } -PreservedAnalyses PromotePass::run(Function &F, AnalysisManager<Function> &AM) { +PreservedAnalyses PromotePass::run(Function &F, FunctionAnalysisManager &AM) { auto &DT = AM.getResult<DominatorTreeAnalysis>(F); auto &AC = AM.getResult<AssumptionAnalysis>(F); if (!promoteMemoryToRegister(F, DT, AC)) diff --git a/lib/Transforms/Utils/MemorySSA.cpp b/lib/Transforms/Utils/MemorySSA.cpp index 2e1ba59a28c..74b29277252 100644 --- a/lib/Transforms/Utils/MemorySSA.cpp +++ b/lib/Transforms/Utils/MemorySSA.cpp @@ -2079,7 +2079,7 @@ bool MemorySSAPrinterLegacyPass::runOnFunction(Function &F) { char MemorySSAAnalysis::PassID; MemorySSAAnalysis::Result -MemorySSAAnalysis::run(Function &F, AnalysisManager<Function> &AM) { +MemorySSAAnalysis::run(Function &F, FunctionAnalysisManager &AM) { auto &DT = AM.getResult<DominatorTreeAnalysis>(F); auto &AA = AM.getResult<AAManager>(F); return MemorySSAAnalysis::Result(make_unique<MemorySSA>(F, &AA, &DT)); diff --git a/lib/Transforms/Utils/SimplifyInstructions.cpp b/lib/Transforms/Utils/SimplifyInstructions.cpp index df299067094..3099c498a7c 100644 --- a/lib/Transforms/Utils/SimplifyInstructions.cpp +++ b/lib/Transforms/Utils/SimplifyInstructions.cpp @@ -126,7 +126,7 @@ FunctionPass *llvm::createInstructionSimplifierPass() { } PreservedAnalyses InstSimplifierPass::run(Function &F, - AnalysisManager<Function> &AM) { + FunctionAnalysisManager &AM) { auto *DT = AM.getCachedResult<DominatorTreeAnalysis>(F); auto &TLI = AM.getResult<TargetLibraryAnalysis>(F); auto &AC = AM.getResult<AssumptionAnalysis>(F); diff --git a/unittests/Analysis/CGSCCPassManagerTest.cpp b/unittests/Analysis/CGSCCPassManagerTest.cpp index 224f2df1318..9d175e42e47 100644 --- a/unittests/Analysis/CGSCCPassManagerTest.cpp +++ b/unittests/Analysis/CGSCCPassManagerTest.cpp @@ -198,7 +198,7 @@ struct TestSCCPass { struct TestFunctionPass { TestFunctionPass(int &RunCount) : RunCount(RunCount) {} - PreservedAnalyses run(Function &F, AnalysisManager<Function> &) { + PreservedAnalyses run(Function &F, FunctionAnalysisManager &) { ++RunCount; return PreservedAnalyses::none(); } |