mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-12-15 04:30:12 +00:00
[PM] Fix the analysis templates' usage of IRUnitT.
This is supposed to be the whole type of the IR unit, and so we shouldn't pass a pointer to it but rather the value itself. In turn, we need to provide a 'Module *' as that type argument (for example). This will become more relevant with SCCs or other units which may not be passed as a pointer type, but also brings consistency with the transformation pass templates. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@195445 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
8dc7f94f4d
commit
3f081983cc
@ -238,7 +238,7 @@ template <typename IRUnitT> struct AnalysisResultConcept {
|
||||
/// took care to update or preserve the analysis result in some way.
|
||||
///
|
||||
/// \returns true if the result is indeed invalid (the default).
|
||||
virtual bool invalidate(IRUnitT *IR, const PreservedAnalyses &PA) = 0;
|
||||
virtual bool invalidate(IRUnitT IR, const PreservedAnalyses &PA) = 0;
|
||||
};
|
||||
|
||||
/// \brief SFINAE metafunction for computing whether \c ResultT provides an
|
||||
@ -247,7 +247,7 @@ template <typename IRUnitT, typename ResultT> class ResultHasInvalidateMethod {
|
||||
typedef char SmallType;
|
||||
struct BigType { char a, b; };
|
||||
|
||||
template <typename T, bool (T::*)(IRUnitT *, const PreservedAnalyses &)>
|
||||
template <typename T, bool (T::*)(IRUnitT, const PreservedAnalyses &)>
|
||||
struct Checker;
|
||||
|
||||
template <typename T> static SmallType f(Checker<T, &T::invalidate> *);
|
||||
@ -283,7 +283,7 @@ struct AnalysisResultModel<IRUnitT, PassT, ResultT,
|
||||
// FIXME: We should actually use two different concepts for analysis results
|
||||
// rather than two different models, and avoid the indirect function call for
|
||||
// ones that use the trivial behavior.
|
||||
virtual bool invalidate(IRUnitT *, const PreservedAnalyses &PA) {
|
||||
virtual bool invalidate(IRUnitT, const PreservedAnalyses &PA) {
|
||||
return !PA.preserved(PassT::ID());
|
||||
}
|
||||
|
||||
@ -301,7 +301,7 @@ struct AnalysisResultModel<IRUnitT, PassT, ResultT,
|
||||
}
|
||||
|
||||
/// \brief The model delegates to the \c ResultT method.
|
||||
virtual bool invalidate(IRUnitT *IR, const PreservedAnalyses &PA) {
|
||||
virtual bool invalidate(IRUnitT IR, const PreservedAnalyses &PA) {
|
||||
return Result.invalidate(IR, PA);
|
||||
}
|
||||
|
||||
@ -319,7 +319,7 @@ template <typename IRUnitT> struct AnalysisPassConcept {
|
||||
/// \brief Method to run this analysis over a unit of IR.
|
||||
/// \returns The analysis result object to be queried by users, the caller
|
||||
/// takes ownership.
|
||||
virtual AnalysisResultConcept<IRUnitT> *run(IRUnitT *IR) = 0;
|
||||
virtual AnalysisResultConcept<IRUnitT> *run(IRUnitT IR) = 0;
|
||||
};
|
||||
|
||||
/// \brief Wrapper to model the analysis pass concept.
|
||||
@ -342,7 +342,7 @@ struct AnalysisPassModel : AnalysisPassConcept<typename PassT::IRUnitT> {
|
||||
/// \brief The model delegates to the \c PassT::run method.
|
||||
///
|
||||
/// The return is wrapped in an \c AnalysisResultModel.
|
||||
virtual ResultModelT *run(IRUnitT *IR) {
|
||||
virtual ResultModelT *run(IRUnitT IR) {
|
||||
return new ResultModelT(Pass.run(IR));
|
||||
}
|
||||
|
||||
@ -418,14 +418,14 @@ public:
|
||||
/// If there is not a valid cached result in the manager already, this will
|
||||
/// re-run the analysis to produce a valid result.
|
||||
template <typename PassT> const typename PassT::Result &getResult(Module *M) {
|
||||
LLVM_STATIC_ASSERT((is_same<typename PassT::IRUnitT, Module>::value),
|
||||
LLVM_STATIC_ASSERT((is_same<typename PassT::IRUnitT, Module *>::value),
|
||||
"The analysis pass must be over a Module.");
|
||||
assert(ModuleAnalysisPasses.count(PassT::ID()) &&
|
||||
"This analysis pass was not registered prior to being queried");
|
||||
|
||||
const detail::AnalysisResultConcept<Module> &ResultConcept =
|
||||
const detail::AnalysisResultConcept<Module *> &ResultConcept =
|
||||
getResultImpl(PassT::ID(), M);
|
||||
typedef detail::AnalysisResultModel<Module, PassT, typename PassT::Result>
|
||||
typedef detail::AnalysisResultModel<Module *, PassT, typename PassT::Result>
|
||||
ResultModelT;
|
||||
return static_cast<const ResultModelT &>(ResultConcept).Result;
|
||||
}
|
||||
@ -438,7 +438,7 @@ public:
|
||||
/// populate
|
||||
/// the manager with all of the analysis passes available.
|
||||
template <typename PassT> void registerPass(PassT Pass) {
|
||||
LLVM_STATIC_ASSERT((is_same<typename PassT::IRUnitT, Module>::value),
|
||||
LLVM_STATIC_ASSERT((is_same<typename PassT::IRUnitT, Module *>::value),
|
||||
"The analysis pass must be over a Module.");
|
||||
assert(!ModuleAnalysisPasses.count(PassT::ID()) &&
|
||||
"Registered the same analysis pass twice!");
|
||||
@ -450,7 +450,7 @@ public:
|
||||
///
|
||||
/// Note that the analysis result can disregard invalidation.
|
||||
template <typename PassT> void invalidate(Module *M) {
|
||||
LLVM_STATIC_ASSERT((is_same<typename PassT::IRUnitT, Module>::value),
|
||||
LLVM_STATIC_ASSERT((is_same<typename PassT::IRUnitT, Module *>::value),
|
||||
"The analysis pass must be over a Module.");
|
||||
assert(ModuleAnalysisPasses.count(PassT::ID()) &&
|
||||
"This analysis pass was not registered prior to being invalidated");
|
||||
@ -465,15 +465,15 @@ public:
|
||||
|
||||
private:
|
||||
/// \brief Get a module pass result, running the pass if necessary.
|
||||
const detail::AnalysisResultConcept<Module> &getResultImpl(void *PassID,
|
||||
Module *M);
|
||||
const detail::AnalysisResultConcept<Module *> &getResultImpl(void *PassID,
|
||||
Module *M);
|
||||
|
||||
/// \brief Invalidate a module pass result.
|
||||
void invalidateImpl(void *PassID, Module *M);
|
||||
|
||||
/// \brief Map type from module analysis pass ID to pass concept pointer.
|
||||
typedef DenseMap<void *,
|
||||
polymorphic_ptr<detail::AnalysisPassConcept<Module> > >
|
||||
polymorphic_ptr<detail::AnalysisPassConcept<Module *> > >
|
||||
ModuleAnalysisPassMapT;
|
||||
|
||||
/// \brief Collection of module analysis passes, indexed by ID.
|
||||
@ -481,7 +481,7 @@ private:
|
||||
|
||||
/// \brief Map type from module analysis pass ID to pass result concept pointer.
|
||||
typedef DenseMap<void *,
|
||||
polymorphic_ptr<detail::AnalysisResultConcept<Module> > >
|
||||
polymorphic_ptr<detail::AnalysisResultConcept<Module *> > >
|
||||
ModuleAnalysisResultMapT;
|
||||
|
||||
/// \brief Cache of computed module analysis results for this module.
|
||||
@ -500,15 +500,15 @@ public:
|
||||
/// re-run the analysis to produce a valid result.
|
||||
template <typename PassT>
|
||||
const typename PassT::Result &getResult(Function *F) {
|
||||
LLVM_STATIC_ASSERT((is_same<typename PassT::IRUnitT, Function>::value),
|
||||
LLVM_STATIC_ASSERT((is_same<typename PassT::IRUnitT, Function *>::value),
|
||||
"The analysis pass must be over a Function.");
|
||||
assert(FunctionAnalysisPasses.count(PassT::ID()) &&
|
||||
"This analysis pass was not registered prior to being queried");
|
||||
|
||||
const detail::AnalysisResultConcept<Function> &ResultConcept =
|
||||
const detail::AnalysisResultConcept<Function *> &ResultConcept =
|
||||
getResultImpl(PassT::ID(), F);
|
||||
typedef detail::AnalysisResultModel<Function, PassT, typename PassT::Result>
|
||||
ResultModelT;
|
||||
typedef detail::AnalysisResultModel<Function *, PassT,
|
||||
typename PassT::Result> ResultModelT;
|
||||
return static_cast<const ResultModelT &>(ResultConcept).Result;
|
||||
}
|
||||
|
||||
@ -520,7 +520,7 @@ public:
|
||||
/// populate
|
||||
/// the manager with all of the analysis passes available.
|
||||
template <typename PassT> void registerPass(PassT Pass) {
|
||||
LLVM_STATIC_ASSERT((is_same<typename PassT::IRUnitT, Function>::value),
|
||||
LLVM_STATIC_ASSERT((is_same<typename PassT::IRUnitT, Function *>::value),
|
||||
"The analysis pass must be over a Function.");
|
||||
assert(!FunctionAnalysisPasses.count(PassT::ID()) &&
|
||||
"Registered the same analysis pass twice!");
|
||||
@ -532,7 +532,7 @@ public:
|
||||
///
|
||||
/// Note that the analysis result can disregard invalidation.
|
||||
template <typename PassT> void invalidate(Function *F) {
|
||||
LLVM_STATIC_ASSERT((is_same<typename PassT::IRUnitT, Function>::value),
|
||||
LLVM_STATIC_ASSERT((is_same<typename PassT::IRUnitT, Function *>::value),
|
||||
"The analysis pass must be over a Function.");
|
||||
assert(FunctionAnalysisPasses.count(PassT::ID()) &&
|
||||
"This analysis pass was not registered prior to being invalidated");
|
||||
@ -559,15 +559,15 @@ public:
|
||||
|
||||
private:
|
||||
/// \brief Get a function pass result, running the pass if necessary.
|
||||
const detail::AnalysisResultConcept<Function> &getResultImpl(void *PassID,
|
||||
Function *F);
|
||||
const detail::AnalysisResultConcept<Function *> &getResultImpl(void *PassID,
|
||||
Function *F);
|
||||
|
||||
/// \brief Invalidate a function pass result.
|
||||
void invalidateImpl(void *PassID, Function *F);
|
||||
|
||||
/// \brief Map type from function analysis pass ID to pass concept pointer.
|
||||
typedef DenseMap<void *,
|
||||
polymorphic_ptr<detail::AnalysisPassConcept<Function> > >
|
||||
polymorphic_ptr<detail::AnalysisPassConcept<Function *> > >
|
||||
FunctionAnalysisPassMapT;
|
||||
|
||||
/// \brief Collection of function analysis passes, indexed by ID.
|
||||
@ -579,7 +579,7 @@ private:
|
||||
/// erases. Provides both the pass ID and concept pointer such that it is
|
||||
/// half of a bijection and provides storage for the actual result concept.
|
||||
typedef std::list<std::pair<
|
||||
void *, polymorphic_ptr<detail::AnalysisResultConcept<Function> > > >
|
||||
void *, polymorphic_ptr<detail::AnalysisResultConcept<Function *> > > >
|
||||
FunctionAnalysisResultListT;
|
||||
|
||||
/// \brief Map type from function pointer to our custom list type.
|
||||
@ -617,7 +617,7 @@ private:
|
||||
/// pass.
|
||||
class FunctionAnalysisManagerModuleProxy {
|
||||
public:
|
||||
typedef Module IRUnitT;
|
||||
typedef Module *IRUnitT;
|
||||
class Result;
|
||||
|
||||
static void *ID() { return (void *)&PassID; }
|
||||
|
@ -33,12 +33,12 @@ void ModuleAnalysisManager::invalidate(Module *M, const PreservedAnalyses &PA) {
|
||||
ModuleAnalysisResults.erase(I);
|
||||
}
|
||||
|
||||
const detail::AnalysisResultConcept<Module> &
|
||||
const detail::AnalysisResultConcept<Module *> &
|
||||
ModuleAnalysisManager::getResultImpl(void *PassID, Module *M) {
|
||||
ModuleAnalysisResultMapT::iterator RI;
|
||||
bool Inserted;
|
||||
llvm::tie(RI, Inserted) = ModuleAnalysisResults.insert(std::make_pair(
|
||||
PassID, polymorphic_ptr<detail::AnalysisResultConcept<Module> >()));
|
||||
PassID, polymorphic_ptr<detail::AnalysisResultConcept<Module *> >()));
|
||||
|
||||
if (Inserted) {
|
||||
// We don't have a cached result for this result. Look up the pass and run
|
||||
@ -100,7 +100,7 @@ void FunctionAnalysisManager::clear() {
|
||||
FunctionAnalysisResultLists.clear();
|
||||
}
|
||||
|
||||
const detail::AnalysisResultConcept<Function> &
|
||||
const detail::AnalysisResultConcept<Function *> &
|
||||
FunctionAnalysisManager::getResultImpl(void *PassID, Function *F) {
|
||||
FunctionAnalysisResultMapT::iterator RI;
|
||||
bool Inserted;
|
||||
|
@ -21,7 +21,7 @@ namespace {
|
||||
|
||||
class TestAnalysisPass {
|
||||
public:
|
||||
typedef Function IRUnitT;
|
||||
typedef Function *IRUnitT;
|
||||
|
||||
struct Result {
|
||||
Result(int Count) : InstructionCount(Count) {}
|
||||
|
Loading…
Reference in New Issue
Block a user