}
void RegisterPassBase::setOnlyUsesCFG() {
- getCFGOnlyAnalyses().push_back(PIObj);
+ getCFGOnlyAnalyses().push_back(&PIObj);
}
//===----------------------------------------------------------------------===//
// AnalysisResolver Class Implementation
//
+AnalysisResolver::~AnalysisResolver() {
+}
void AnalysisResolver::setAnalysisResolver(Pass *P, AnalysisResolver *AR) {
assert(P->Resolver == 0 && "Pass already in a PassManager!");
P->Resolver = AR;
// PassManager implementation - The PassManager class is a simple Pimpl class
// that wraps the PassManagerT template.
//
-PassManager::PassManager() : PM(new PassManagerT<Module>()) {}
+PassManager::PassManager() : PM(new ModulePassManager()) {}
PassManager::~PassManager() { delete PM; }
void PassManager::add(Pass *P) {
ModulePass *MP = dynamic_cast<ModulePass*>(P);
// is like PassManager, but only deals in FunctionPasses.
//
FunctionPassManager::FunctionPassManager(ModuleProvider *P) :
- PM(new PassManagerT<Function>()), MP(P) {}
+ PM(new FunctionPassManagerT()), MP(P) {}
FunctionPassManager::~FunctionPassManager() { delete PM; }
void FunctionPassManager::add(FunctionPass *P) { PM->add(P); }
void FunctionPassManager::add(ImmutablePass *IP) { PM->add(IP); }
// Pass Implementation
//
-void ModulePass::addToPassManager(PassManagerT<Module> *PM, AnalysisUsage &AU) {
+void ModulePass::addToPassManager(ModulePassManager *PM, AnalysisUsage &AU) {
PM->addPass(this, AU);
}
//===----------------------------------------------------------------------===//
// ImmutablePass Implementation
//
-void ImmutablePass::addToPassManager(PassManagerT<Module> *PM,
+void ImmutablePass::addToPassManager(ModulePassManager *PM,
AnalysisUsage &AU) {
PM->addPass(this, AU);
}
return Changed | doFinalization(*F.getParent());
}
-void FunctionPass::addToPassManager(PassManagerT<Module> *PM,
+void FunctionPass::addToPassManager(ModulePassManager *PM,
AnalysisUsage &AU) {
PM->addPass(this, AU);
}
-void FunctionPass::addToPassManager(PassManagerT<Function> *PM,
+void FunctionPass::addToPassManager(FunctionPassManagerT *PM,
AnalysisUsage &AU) {
PM->addPass(this, AU);
}
return Changed;
}
-void BasicBlockPass::addToPassManager(PassManagerT<Function> *PM,
+void BasicBlockPass::addToPassManager(FunctionPassManagerT *PM,
AnalysisUsage &AU) {
PM->addPass(this, AU);
}
-void BasicBlockPass::addToPassManager(PassManagerT<BasicBlock> *PM,
+void BasicBlockPass::addToPassManager(BasicBlockPassManager *PM,
AnalysisUsage &AU) {
PM->addPass(this, AU);
}
return (I != PassInfoMap->end()) ? I->second : 0;
}
-void RegisterPassBase::registerPass(PassInfo *PI) {
+void RegisterPassBase::registerPass() {
if (PassInfoMap == 0)
PassInfoMap = new std::map<TypeInfo, PassInfo*>();
- assert(PassInfoMap->find(PI->getTypeInfo()) == PassInfoMap->end() &&
+ assert(PassInfoMap->find(PIObj.getTypeInfo()) == PassInfoMap->end() &&
"Pass already registered!");
- PIObj = PI;
- PassInfoMap->insert(std::make_pair(TypeInfo(PI->getTypeInfo()), PI));
+ PassInfoMap->insert(std::make_pair(TypeInfo(PIObj.getTypeInfo()), &PIObj));
// Notify any listeners...
if (Listeners)
for (std::vector<PassRegistrationListener*>::iterator
I = Listeners->begin(), E = Listeners->end(); I != E; ++I)
- (*I)->passRegistered(PI);
+ (*I)->passRegistered(&PIObj);
}
-void RegisterPassBase::unregisterPass(PassInfo *PI) {
+void RegisterPassBase::unregisterPass() {
assert(PassInfoMap && "Pass registered but not in map!");
std::map<TypeInfo, PassInfo*>::iterator I =
- PassInfoMap->find(PI->getTypeInfo());
+ PassInfoMap->find(PIObj.getTypeInfo());
assert(I != PassInfoMap->end() && "Pass registered but not in map!");
// Remove pass from the map...
if (Listeners)
for (std::vector<PassRegistrationListener*>::iterator
I = Listeners->begin(), E = Listeners->end(); I != E; ++I)
- (*I)->passUnregistered(PI);
-
- // Delete the PassInfo object itself...
- delete PI;
+ (*I)->passUnregistered(&PIObj);
}
//===----------------------------------------------------------------------===//
//
RegisterAGBase::RegisterAGBase(const std::type_info &Interface,
const std::type_info *Pass, bool isDefault)
- : ImplementationInfo(0), isDefaultImplementation(isDefault) {
+ : RegisterPassBase(Interface, PassInfo::AnalysisGroup),
+ ImplementationInfo(0), isDefaultImplementation(isDefault) {
InterfaceInfo = const_cast<PassInfo*>(Pass::lookupPassInfo(Interface));
- if (InterfaceInfo == 0) { // First reference to Interface, add it now.
- InterfaceInfo = // Create the new PassInfo for the interface...
- new PassInfo("", "", Interface, PassInfo::AnalysisGroup, 0, 0);
- registerPass(InterfaceInfo);
- PIObj = 0;
+ if (InterfaceInfo == 0) {
+ // First reference to Interface, register it now.
+ registerPass();
+ InterfaceInfo = &PIObj;
}
assert(InterfaceInfo->getPassType() == PassInfo::AnalysisGroup &&
"Trying to join an analysis group that is a normal pass!");
delete AnalysisGroupInfoMap;
AnalysisGroupInfoMap = 0;
}
-
- unregisterPass(InterfaceInfo);
}
}
+
+ if (InterfaceInfo == &PIObj)
+ unregisterPass();
}
E = PassInfoMap->end(); I != E; ++I)
passEnumerate(I->second);
}
+