[llvm-commits] CVS: llvm/include/llvm/Pass.h PassAnalysisSupport.h
Devang Patel
dpatel at apple.com
Fri Jan 5 14:47:25 PST 2007
Changes in directory llvm/include/llvm:
Pass.h updated: 1.69 -> 1.70
PassAnalysisSupport.h updated: 1.27 -> 1.28
---
Log message:
1) Remove old AnalysisResolver.
2) Rename AnalysisResolver_New as AnalysisResolver
---
Diffs of the changes: (+15 -46)
Pass.h | 12 ++++++------
PassAnalysisSupport.h | 49 +++++++++----------------------------------------
2 files changed, 15 insertions(+), 46 deletions(-)
Index: llvm/include/llvm/Pass.h
diff -u llvm/include/llvm/Pass.h:1.69 llvm/include/llvm/Pass.h:1.70
--- llvm/include/llvm/Pass.h:1.69 Fri Jan 5 14:16:23 2007
+++ llvm/include/llvm/Pass.h Fri Jan 5 16:47:07 2007
@@ -49,7 +49,7 @@
class BasicBlockPassManager;
class FunctionPassManagerT;
class ModulePassManager;
-class AnalysisResolver_New;
+class AnalysisResolver;
// AnalysisID - Use the PassInfo to identify a pass...
typedef const PassInfo* AnalysisID;
@@ -60,7 +60,7 @@
/// constrained passes described below.
///
class Pass {
- AnalysisResolver_New *Resolver_New; // Used to resolve analysis
+ AnalysisResolver *Resolver; // Used to resolve analysis
const PassInfo *PassInfoCache;
// AnalysisImpls - This keeps track of which passes implement the interfaces
@@ -71,7 +71,7 @@
void operator=(const Pass&); // DO NOT IMPLEMENT
Pass(const Pass &); // DO NOT IMPLEMENT
public:
- Pass() : Resolver_New(0), PassInfoCache(0) {}
+ Pass() : Resolver(0), PassInfoCache(0) {}
virtual ~Pass() {} // Destructor is virtual so we can be subclassed
/// getPassName - Return a nice clean name for a pass. This usually
@@ -104,9 +104,9 @@
void print(std::ostream *O, const Module *M) const { if (O) print(*O, M); }
void dump() const; // dump - call print(std::cerr, 0);
- // Access AnalysisResolver_New
- inline void setResolver(AnalysisResolver_New *AR) { Resolver_New = AR; }
- inline AnalysisResolver_New *getResolver() { return Resolver_New; }
+ // Access AnalysisResolver
+ inline void setResolver(AnalysisResolver *AR) { Resolver = AR; }
+ inline AnalysisResolver *getResolver() { return Resolver; }
/// getAnalysisUsage - This function should be overriden by passes that need
/// analysis information to do their job. If a pass specifies that it uses a
Index: llvm/include/llvm/PassAnalysisSupport.h
diff -u llvm/include/llvm/PassAnalysisSupport.h:1.27 llvm/include/llvm/PassAnalysisSupport.h:1.28
--- llvm/include/llvm/PassAnalysisSupport.h:1.27 Fri Jan 5 14:16:23 2007
+++ llvm/include/llvm/PassAnalysisSupport.h Fri Jan 5 16:47:07 2007
@@ -106,12 +106,12 @@
// the pass.
//
class PMDataManager;
-class AnalysisResolver_New {
+class AnalysisResolver {
private:
- AnalysisResolver_New(); // DO NOT IMPLEMENT
+ AnalysisResolver(); // DO NOT IMPLEMENT
public:
- AnalysisResolver_New(PMDataManager &P) : PM(P) { }
+ AnalysisResolver(PMDataManager &P) : PM(P) { }
inline PMDataManager &getPMDataManager() { return PM; }
@@ -137,7 +137,7 @@
// AnalysisImpls - This keeps track of which passes implements the interfaces
// that are required by the current pass (to implement getAnalysis()).
- // NOTE : Remove AnalysisImpls from class Pass, when AnalysisResolver_New
+ // NOTE : Remove AnalysisImpls from class Pass, when AnalysisResolver
// replaces AnalysisResolver
std::vector<std::pair<const PassInfo*, Pass*> > AnalysisImpls;
@@ -146,37 +146,6 @@
PMDataManager &PM;
};
-//===----------------------------------------------------------------------===//
-// AnalysisResolver - Simple interface implemented by PassManager objects that
-// is used to pull analysis information out of them.
-//
-struct AnalysisResolver {
- virtual ~AnalysisResolver();
- virtual Pass *getAnalysisOrNullUp(AnalysisID ID) const = 0;
- virtual Pass *getAnalysisOrNullDown(AnalysisID ID) const = 0;
- virtual void addPass(ImmutablePass *IP, AnalysisUsage &AU) = 0;
- Pass *getAnalysis(AnalysisID ID) const {
- Pass *Result = getAnalysisOrNullUp(ID);
- assert(Result && "Pass has an incorrect analysis uses set!");
- return Result;
- }
-
- // getAnalysisToUpdate - Return an analysis result or null if it doesn't exist
- Pass *getAnalysisToUpdate(AnalysisID ID) const {
- return getAnalysisOrNullUp(ID);
- }
-
- // Methods for introspecting into pass manager objects...
- virtual unsigned getDepth() const = 0;
- virtual unsigned getNumContainedPasses() const = 0;
- virtual const Pass *getContainedPass(unsigned N) const = 0;
-
- virtual void markPassUsed(AnalysisID P, Pass *User) = 0;
-
- void startPass(Pass *P) {}
- void endPass(Pass *P) {}
-};
-
/// getAnalysisToUpdate<AnalysisType>() - This function is used by subclasses
/// to get to the analysis information that might be around that needs to be
/// updated. This is different than getAnalysis in that it can fail (ie the
@@ -187,12 +156,12 @@
///
template<typename AnalysisType>
AnalysisType *Pass::getAnalysisToUpdate() const {
- assert(Resolver_New && "Pass not resident in a PassManager object!");
+ assert(Resolver && "Pass not resident in a PassManager object!");
const PassInfo *PI = getClassPassInfo<AnalysisType>();
if (PI == 0) return 0;
return dynamic_cast<AnalysisType*>
- (Resolver_New->getAnalysisToUpdate(PI, true));
+ (Resolver->getAnalysisToUpdate(PI, true));
}
/// getAnalysis<AnalysisType>() - This function is used by subclasses to get
@@ -201,7 +170,7 @@
///
template<typename AnalysisType>
AnalysisType &Pass::getAnalysis() const {
- assert(Resolver_New &&"Pass has not been inserted into a PassManager object!");
+ assert(Resolver &&"Pass has not been inserted into a PassManager object!");
return getAnalysisID<AnalysisType>(getClassPassInfo<AnalysisType>());
}
@@ -209,11 +178,11 @@
template<typename AnalysisType>
AnalysisType &Pass::getAnalysisID(const PassInfo *PI) const {
assert(PI && "getAnalysis for unregistered pass!");
- assert(Resolver_New&&"Pass has not been inserted into a PassManager object!");
+ assert(Resolver&&"Pass has not been inserted into a PassManager object!");
// PI *must* appear in AnalysisImpls. Because the number of passes used
// should be a small number, we just do a linear search over a (dense)
// vector.
- Pass *ResultPass = Resolver_New->findImplPass(PI);
+ Pass *ResultPass = Resolver->findImplPass(PI);
assert (ResultPass &&
"getAnalysis*() called on an analysis that was not "
"'required' by pass!");
More information about the llvm-commits
mailing list