Index: include/llvm/PassManager.h =================================================================== --- include/llvm/PassManager.h (revision 167748) +++ include/llvm/PassManager.h (working copy) @@ -58,6 +58,14 @@ /// whether any of the passes modifies the module, and if so, return true. bool run(Module &M); + /// doInitialization - Run all of the initializers for the module passes. + /// + bool doInitialization(); + + /// doFinalization - Run all of the finalizers for the module passes. + /// + bool doFinalization(); + private: /// PassManagerImpl_New is the actual class. PassManager is just the /// wraper to publish simple pass manager interface Index: include/llvm/Pass.h =================================================================== --- include/llvm/Pass.h (revision 167748) +++ include/llvm/Pass.h (working copy) @@ -227,10 +227,20 @@ /// createPrinterPass - Get a module printer pass. Pass *createPrinterPass(raw_ostream &O, const std::string &Banner) const; + /// doInitialization - Virtual method overridden by subclasses to do + /// any necessary initialization. + /// + virtual bool doInitialization(void) { return false; } + /// runOnModule - Virtual method overriden by subclasses to process the module /// being operated on. virtual bool runOnModule(Module &M) = 0; + /// doFinalization - Virtual method overriden by subclasses to do any post + /// processing needed after all passes have run. + /// + virtual bool doFinalization(void) { return false; } + virtual void assignPassManager(PMStack &PMS, PassManagerType T); Index: include/llvm/PassManagers.h =================================================================== --- include/llvm/PassManagers.h (revision 167748) +++ include/llvm/PassManagers.h (working copy) @@ -420,10 +420,20 @@ /// cleanup - After running all passes, clean up pass manager cache. void cleanup(); + /// doInitialization - Overrides ModulePass doInitialization for global + /// initialization tasks + /// + using ModulePass::doInitialization; + /// doInitialization - Run all of the initializers for the function passes. /// bool doInitialization(Module &M); + /// doFinalization - Overrides ModulePass doFinalization for global + /// finalization tasks + /// + using ModulePass::doFinalization; + /// doFinalization - Run all of the finalizers for the function passes. /// bool doFinalization(Module &M); Index: tools/lto/LTOCodeGenerator.cpp =================================================================== --- tools/lto/LTOCodeGenerator.cpp (revision 167748) +++ tools/lto/LTOCodeGenerator.cpp (working copy) @@ -342,7 +342,9 @@ passes.add(createInternalizePass(mustPreserveList)); // apply scope restrictions + passes.doInitialization(); passes.run(*mergedModule); + passes.doFinalization(); _scopeRestrictionsDone = true; } @@ -397,7 +399,9 @@ } // Run our queue of passes all at once now, efficiently. + passes.doInitialization(); passes.run(*mergedModule); + passes.doFinalization(); // Run the code generator, and write assembly file codeGenPasses->doInitialization(); Index: tools/opt/opt.cpp =================================================================== --- tools/opt/opt.cpp (revision 167748) +++ tools/opt/opt.cpp (working copy) @@ -820,7 +820,9 @@ cl::PrintOptionValues(); // Now that we have all of the passes ready, run them. + Passes.doInitialization(); Passes.run(*M.get()); + Passes.doFinalization(); // Declare success. if (!NoOutput || PrintBreakpoints) Index: tools/llvm-prof/llvm-prof.cpp =================================================================== --- tools/llvm-prof/llvm-prof.cpp (revision 167748) +++ tools/llvm-prof/llvm-prof.cpp (working copy) @@ -287,7 +287,9 @@ PassManager PassMgr; PassMgr.add(createProfileLoaderPass(ProfileDataFile)); PassMgr.add(new ProfileInfoPrinterPass(PIL)); + PassMgr.doInitialization(); PassMgr.run(*M); + PassMgr.doFinalization(); return 0; } Index: tools/llvm-extract/llvm-extract.cpp =================================================================== --- tools/llvm-extract/llvm-extract.cpp (revision 167748) +++ tools/llvm-extract/llvm-extract.cpp (working copy) @@ -276,7 +276,9 @@ else if (Force || !CheckBitcodeOutputToConsole(Out.os(), true)) Passes.add(createBitcodeWriterPass(Out.os())); + Passes.doInitialization(); Passes.run(*M.get()); + Passes.doFinalization(); // Declare success. Out.keep(); Index: tools/bugpoint/CrashDebugger.cpp =================================================================== --- tools/bugpoint/CrashDebugger.cpp (revision 167748) +++ tools/bugpoint/CrashDebugger.cpp (working copy) @@ -412,7 +412,9 @@ // Verify that this is still valid. PassManager Passes; Passes.add(createVerifierPass()); + Passes.doInitialization(); Passes.run(*M); + Passes.doFinalization(); // Try running on the hacked up program... if (TestFn(BD, M)) { Index: tools/llvm-stress/llvm-stress.cpp =================================================================== --- tools/llvm-stress/llvm-stress.cpp (revision 167748) +++ tools/llvm-stress/llvm-stress.cpp (working copy) @@ -713,7 +713,9 @@ PassManager Passes; Passes.add(createVerifierPass()); Passes.add(createPrintModulePass(&Out->os())); + Passes.doInitialization(); Passes.run(*M.get()); + Passes.doFinalization(); Out->keep(); return 0; Index: tools/llc/llc.cpp =================================================================== --- tools/llc/llc.cpp (revision 167748) +++ tools/llc/llc.cpp (working copy) @@ -359,7 +359,9 @@ // Before executing passes, print the final values of the LLVM options. cl::PrintOptionValues(); + PM.doInitialization(); PM.run(*mod); + PM.doFinalization(); } // Declare success. Index: lib/Analysis/IPA/CallGraphSCCPass.cpp =================================================================== --- lib/Analysis/IPA/CallGraphSCCPass.cpp (revision 167748) +++ lib/Analysis/IPA/CallGraphSCCPass.cpp (working copy) @@ -51,6 +51,9 @@ /// whether any of the passes modifies the module, and if so, return true. bool runOnModule(Module &M); + using ModulePass::doInitialization; + using ModulePass::doFinalization; + bool doInitialization(CallGraph &CG); bool doFinalization(CallGraph &CG); Index: lib/VMCore/PassManager.cpp =================================================================== --- lib/VMCore/PassManager.cpp (revision 167748) +++ lib/VMCore/PassManager.cpp (working copy) @@ -309,6 +309,14 @@ /// whether any of the passes modifies the module, and if so, return true. bool runOnModule(Module &M); + /// doInitialization - Run all of the initializers for the module passes. + /// + bool doInitialization(void); + + /// doFinalization - Run all of the finalizers for the module passes. + /// + bool doFinalization(void); + /// Pass Manager itself does not invalidate any analysis info. void getAnalysisUsage(AnalysisUsage &Info) const { Info.setPreservesAll(); @@ -394,6 +402,14 @@ /// whether any of the passes modifies the module, and if so, return true. bool run(Module &M); + /// doInitialization - Run all of the initializers for the module passes. + /// + bool doInitialization(void); + + /// doFinalization - Run all of the finalizers for the module passes. + /// + bool doFinalization(void); + /// Pass Manager itself does not invalidate any analysis info. void getAnalysisUsage(AnalysisUsage &Info) const { Info.setPreservesAll(); @@ -1594,9 +1610,32 @@ FPP->releaseMemoryOnTheFly(); Changed |= FPP->doFinalization(M); } + return Changed; } +/// Run all of the initializers for the module passes. +/// +bool MPPassManager::doInitialization(void) { + bool Changed = false; + + for (unsigned Index = 0; Index < getNumContainedPasses(); ++Index) + Changed |= getContainedPass(Index)->doInitialization(); + + return Changed; +} + +/// Run all of the finalizers for the module passes. +/// +bool MPPassManager::doFinalization(void) { + bool Changed = false; + + for (unsigned Index = 0; Index < getNumContainedPasses(); ++Index) + Changed |= getContainedPass(Index)->doFinalization(); + + return Changed; +} + /// Add RequiredPass into list of lower level passes required by pass P. /// RequiredPass is run on the fly by Pass Manager when P requests it /// through getAnalysis interface. @@ -1640,6 +1679,25 @@ //===----------------------------------------------------------------------===// // PassManagerImpl implementation + +bool PassManagerImpl::doInitialization(void) { + bool Changed = false; + + for (unsigned Index = 0; Index < getNumContainedManagers(); ++Index) + Changed |= getContainedManager(Index)->doInitialization(); + + return Changed; +} + +bool PassManagerImpl::doFinalization(void) { + bool Changed = false; + + for (unsigned Index = 0; Index < getNumContainedManagers(); ++Index) + Changed |= getContainedManager(Index)->doFinalization(); + + return Changed; +} + // /// run - Execute all of the passes scheduled for execution. Keep track of /// whether any of the passes modifies the module, and if so, return true. @@ -1684,6 +1742,18 @@ return PM->run(M); } +/// doInitialization - Run all of the initializers for the module passes. +/// +bool PassManager::doInitialization() { + return PM->doInitialization(); +} + +/// doFinalization - Run all of the finalizers for the module passes. +/// +bool PassManager::doFinalization() { + return PM->doFinalization(); +} + //===----------------------------------------------------------------------===// // TimingInfo Class - This class is used to calculate information about the // amount of time each pass takes to execute. This only happens with