Index: lib/IR/LegacyPassManager.cpp
===================================================================
--- lib/IR/LegacyPassManager.cpp
+++ lib/IR/LegacyPassManager.cpp
@@ -1372,7 +1372,7 @@
 // FunctionPassManager implementation
 
 /// Create new Function pass manager
-FunctionPassManager::FunctionPassManager(Module *m) : M(m) {
+legacy::FunctionPassManager::FunctionPassManager(Module *m) : M(m) {
   FPM = new FunctionPassManagerImpl();
   // FPM is the top level manager.
   FPM->setTopLevelManager(FPM);
@@ -1381,11 +1381,11 @@
   FPM->setResolver(AR);
 }
 
-FunctionPassManager::~FunctionPassManager() {
+legacy::FunctionPassManager::~FunctionPassManager() {
   delete FPM;
 }
 
-void FunctionPassManager::add(Pass *P) {
+void legacy::FunctionPassManager::add(Pass *P) {
   FPM->add(P);
 }
 
@@ -1393,7 +1393,7 @@
 /// track of whether any of the passes modifies the function, and if
 /// so, return true.
 ///
-bool FunctionPassManager::run(Function &F) {
+bool legacy::FunctionPassManager::run(Function &F) {
   if (std::error_code EC = F.materialize())
     report_fatal_error("Error reading bitcode file: " + EC.message());
   return FPM->run(F);
@@ -1402,18 +1402,18 @@
 
 /// doInitialization - Run all of the initializers for the function passes.
 ///
-bool FunctionPassManager::doInitialization() {
+bool legacy::FunctionPassManager::doInitialization() {
   return FPM->doInitialization(*M);
 }
 
 /// doFinalization - Run all of the finalizers for the function passes.
 ///
-bool FunctionPassManager::doFinalization() {
+bool legacy::FunctionPassManager::doFinalization() {
   return FPM->doFinalization(*M);
 }
 
 //===----------------------------------------------------------------------===//
-// FunctionPassManagerImpl implementation
+// legacy::FunctionPassManagerImpl implementation
 //
 bool FunctionPassManagerImpl::doInitialization(Module &M) {
   bool Changed = false;
@@ -1717,23 +1717,23 @@
 // PassManager implementation
 
 /// Create new pass manager
-PassManager::PassManager() {
+legacy::PassManager::PassManager() {
   PM = new PassManagerImpl();
   // PM is the top level manager
   PM->setTopLevelManager(PM);
 }
 
-PassManager::~PassManager() {
+legacy::PassManager::~PassManager() {
   delete PM;
 }
 
-void PassManager::add(Pass *P) {
+void legacy::PassManager::add(Pass *P) {
   PM->add(P);
 }
 
 /// 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.
-bool PassManager::run(Module &M) {
+bool legacy::PassManager::run(Module &M) {
   return PM->run(M);
 }