Index: include/llvm/PassManager.h =================================================================== --- include/llvm/PassManager.h (revision 168597) +++ include/llvm/PassManager.h (working copy) @@ -58,14 +58,6 @@ /// 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 168597) +++ include/llvm/Pass.h (working copy) @@ -230,7 +230,7 @@ /// doInitialization - Virtual method overridden by subclasses to do /// any necessary initialization. /// - virtual bool doInitialization() { return false; } + virtual bool doInitialization(Module &) { return false; } /// runOnModule - Virtual method overriden by subclasses to process the module /// being operated on. @@ -239,7 +239,7 @@ /// doFinalization - Virtual method overriden by subclasses to do any post /// processing needed after all passes have run. /// - virtual bool doFinalization() { return false; } + virtual bool doFinalization(Module &) { return false; } virtual void assignPassManager(PMStack &PMS, PassManagerType T); Index: include/llvm/CodeGen/MachineModuleInfo.h =================================================================== --- include/llvm/CodeGen/MachineModuleInfo.h (revision 168597) +++ include/llvm/CodeGen/MachineModuleInfo.h (working copy) @@ -180,7 +180,10 @@ const MCObjectFileInfo *MOFI); ~MachineModuleInfo(); + using ModulePass::doInitialization; bool doInitialization(); + + using ModulePass::doFinalization; bool doFinalization(); /// EndFunction - Discard function meta information. Index: include/llvm/PassManagers.h =================================================================== --- include/llvm/PassManagers.h (revision 168597) +++ include/llvm/PassManagers.h (working copy) @@ -462,6 +462,10 @@ virtual PassManagerType getPassManagerType() const { return PMT_FunctionPassManager; } + +protected: + // FIXME: due to limitation in AddressSanitizer + bool RunFinalization; }; Timer *getPassTimer(Pass *); Index: tools/lto/LTOCodeGenerator.cpp =================================================================== --- tools/lto/LTOCodeGenerator.cpp (revision 168597) +++ tools/lto/LTOCodeGenerator.cpp (working copy) @@ -342,9 +342,7 @@ passes.add(createInternalizePass(mustPreserveList)); // apply scope restrictions - passes.doInitialization(); passes.run(*mergedModule); - passes.doFinalization(); _scopeRestrictionsDone = true; } @@ -399,9 +397,7 @@ } // 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 168597) +++ tools/opt/opt.cpp (working copy) @@ -820,9 +820,7 @@ 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 168597) +++ tools/llvm-prof/llvm-prof.cpp (working copy) @@ -287,9 +287,7 @@ 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 168597) +++ tools/llvm-extract/llvm-extract.cpp (working copy) @@ -276,9 +276,7 @@ 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 168597) +++ tools/bugpoint/CrashDebugger.cpp (working copy) @@ -412,9 +412,7 @@ // 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 168597) +++ tools/llvm-stress/llvm-stress.cpp (working copy) @@ -713,9 +713,7 @@ 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 168597) +++ tools/llc/llc.cpp (working copy) @@ -359,9 +359,7 @@ // Before executing passes, print the final values of the LLVM options. cl::PrintOptionValues(); - PM.doInitialization(); PM.run(*mod); - PM.doFinalization(); } // Declare success. Index: lib/VMCore/PassManager.cpp =================================================================== --- lib/VMCore/PassManager.cpp (revision 168597) +++ lib/VMCore/PassManager.cpp (working copy) @@ -1528,11 +1528,13 @@ } bool FPPassManager::runOnModule(Module &M) { - bool Changed = doInitialization(M); + bool Changed = false; for (Module::iterator I = M.begin(), E = M.end(); I != E; ++I) Changed |= runOnFunction(*I); + // FIXME: doFinalization still needed here due to assumption in + // AddressSanitizer return doFinalization(M) || Changed; } @@ -1542,14 +1544,25 @@ for (unsigned Index = 0; Index < getNumContainedPasses(); ++Index) Changed |= getContainedPass(Index)->doInitialization(M); + // FIXME: mark Finalization as needed here due to assumption in + // AddressSanitizer + RunFinalization = true; + return Changed; } bool FPPassManager::doFinalization(Module &M) { bool Changed = false; - + + // FIXME: due to limitation in AddressSanitizer + if (!RunFinalization) + return Changed; + for (unsigned Index = 0; Index < getNumContainedPasses(); ++Index) Changed |= getContainedPass(Index)->doFinalization(M); + + // FIXME: due to limitation in AddressSanitizer + RunFinalization = false; return Changed; } @@ -1572,6 +1585,10 @@ Changed |= FPP->doInitialization(M); } + // Initialize module passes + for (unsigned Index = 0; Index < getNumContainedPasses(); ++Index) + Changed |= getContainedPass(Index)->doInitialization(M); + for (unsigned Index = 0; Index < getNumContainedPasses(); ++Index) { ModulePass *MP = getContainedPass(Index); bool LocalChanged = false; @@ -1600,6 +1617,10 @@ removeDeadPasses(MP, M.getModuleIdentifier(), ON_MODULE_MSG); } + // Finalize module passes + for (unsigned Index = 0; Index < getNumContainedPasses(); ++Index) + Changed |= getContainedPass(Index)->doFinalization(M); + // Finalize on-the-fly passes for (std::map::iterator I = OnTheFlyManagers.begin(), E = OnTheFlyManagers.end(); @@ -1610,32 +1631,10 @@ FPP->releaseMemoryOnTheFly(); Changed |= FPP->doFinalization(M); } - + return Changed; } -/// Run all of the initializers for the module passes. -/// -bool MPPassManager::doInitialization() { - 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() { - 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. @@ -1692,24 +1691,6 @@ //===----------------------------------------------------------------------===// // PassManagerImpl implementation -bool PassManagerImpl::doInitialization() { - bool Changed = false; - - for (unsigned Index = 0; Index < getNumContainedManagers(); ++Index) - Changed |= getContainedManager(Index)->doInitialization(); - - return Changed; -} - -bool PassManagerImpl::doFinalization() { - 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. @@ -1754,18 +1735,6 @@ 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