diff --git a/include/llvm/Pass.h b/include/llvm/Pass.h
index f4c6eed2cf9..9f4e963343c 100644
--- a/include/llvm/Pass.h
+++ b/include/llvm/Pass.h
@@ -163,7 +163,7 @@ public:
   virtual void verifyAnalysis() const;
 
   // dumpPassStructure - Implement the -debug-passes=PassStructure option
-  virtual void dumpPassStructure(unsigned Offset = 0);
+  void dumpPass(unsigned Offset = 0);
 
   // lookupPassInfo - Return the pass info object for the specified pass class,
   // or null if it is not known.
diff --git a/include/llvm/PassManagers.h b/include/llvm/PassManagers.h
index 17f4a0592fb..e3241842077 100644
--- a/include/llvm/PassManagers.h
+++ b/include/llvm/PassManagers.h
@@ -362,6 +362,9 @@ public:
       InheritedAnalysis[Index++] = (*I)->getAvailableAnalysis();
   }
 
+  /// dumpPassStructure - Implement the -debug-passes=PassStructure option.
+  virtual void dumpPassStructure(unsigned Offset) = 0;
+
 protected:
 
   // Top level manager.
diff --git a/lib/Analysis/IPA/CallGraphSCCPass.cpp b/lib/Analysis/IPA/CallGraphSCCPass.cpp
index b7a27cb288d..1063190f4e5 100644
--- a/lib/Analysis/IPA/CallGraphSCCPass.cpp
+++ b/lib/Analysis/IPA/CallGraphSCCPass.cpp
@@ -73,7 +73,7 @@ public:
     errs().indent(Offset*2) << "Call Graph SCC Pass Manager\n";
     for (unsigned Index = 0; Index < getNumContainedPasses(); ++Index) {
       Pass *P = getContainedPass(Index);
-      P->dumpPassStructure(Offset + 1);
+      P->dumpPass(Offset + 1);
       dumpLastUses(P, Offset+1);
     }
   }
diff --git a/lib/Analysis/LoopPass.cpp b/lib/Analysis/LoopPass.cpp
index 15d4db8f5f9..718b615aa5c 100644
--- a/lib/Analysis/LoopPass.cpp
+++ b/lib/Analysis/LoopPass.cpp
@@ -332,7 +332,7 @@ void LPPassManager::dumpPassStructure(unsigned Offset) {
   errs().indent(Offset*2) << "Loop Pass Manager\n";
   for (unsigned Index = 0; Index < getNumContainedPasses(); ++Index) {
     Pass *P = getContainedPass(Index);
-    P->dumpPassStructure(Offset + 1);
+    P->dumpPass(Offset + 1);
     dumpLastUses(P, Offset+1);
   }
 }
diff --git a/lib/VMCore/Pass.cpp b/lib/VMCore/Pass.cpp
index a7d7f61dd76..9995d1d4922 100644
--- a/lib/VMCore/Pass.cpp
+++ b/lib/VMCore/Pass.cpp
@@ -48,8 +48,8 @@ bool Pass::mustPreserveAnalysisID(char &AID) const {
   return Resolver->getAnalysisIfAvailable(&AID, true) != 0;
 }
 
-// dumpPassStructure - Implement the -debug-passes=Structure option
-void Pass::dumpPassStructure(unsigned Offset) {
+// dumpPass - Implement the -debug-passes=Structure option
+void Pass::dumpPass(unsigned Offset) {
   dbgs().indent(Offset*2) << getPassName() << "\n";
 }
 
diff --git a/lib/VMCore/PassManager.cpp b/lib/VMCore/PassManager.cpp
index ba06e92d9d9..664ef1f08e2 100644
--- a/lib/VMCore/PassManager.cpp
+++ b/lib/VMCore/PassManager.cpp
@@ -192,7 +192,7 @@ public:
     llvm::dbgs() << std::string(Offset*2, ' ') << "BasicBlockPass Manager\n";
     for (unsigned Index = 0; Index < getNumContainedPasses(); ++Index) {
       BasicBlockPass *BP = getContainedPass(Index);
-      BP->dumpPassStructure(Offset + 1);
+      BP->dumpPass(Offset + 1);
       dumpLastUses(BP, Offset+1);
     }
   }
@@ -286,6 +286,11 @@ public:
     FPPassManager *FP = static_cast<FPPassManager *>(PassManagers[N]);
     return FP;
   }
+
+  /// dumpPassStructure - Implement the -debug-passes=PassStructure option.
+  void dumpPassStructure(unsigned) {
+    llvm_unreachable("dumpPassStructure called on FunctionPassManagerImpl");
+  }
 };
 
 char FunctionPassManagerImpl::ID = 0;
@@ -348,7 +353,7 @@ public:
     llvm::dbgs() << std::string(Offset*2, ' ') << "ModulePass Manager\n";
     for (unsigned Index = 0; Index < getNumContainedPasses(); ++Index) {
       ModulePass *MP = getContainedPass(Index);
-      MP->dumpPassStructure(Offset + 1);
+      MP->dumpPass(Offset + 1);
       std::map<Pass *, FunctionPassManagerImpl *>::const_iterator I =
         OnTheFlyManagers.find(MP);
       if (I != OnTheFlyManagers.end())
@@ -432,6 +437,11 @@ public:
     MPPassManager *MP = static_cast<MPPassManager *>(PassManagers[N]);
     return MP;
   }
+
+  /// dumpPassStructure - Implement the -debug-passes=PassStructure option.
+  void dumpPassStructure(unsigned) {
+    llvm_unreachable("dumpPassStructure called on PassManagerImpl");
+  }
 };
 
 char PassManagerImpl::ID = 0;
@@ -657,16 +667,14 @@ void PMTopLevelManager::dumpPasses() const {
 
   // Print out the immutable passes
   for (unsigned i = 0, e = ImmutablePasses.size(); i != e; ++i) {
-    ImmutablePasses[i]->dumpPassStructure(0);
+    ImmutablePasses[i]->dumpPass();
   }
 
-  // Every class that derives from PMDataManager also derives from Pass
-  // (sometimes indirectly), but there's no inheritance relationship
-  // between PMDataManager and Pass, so we have to getAsPass to get
-  // from a PMDataManager* to a Pass*.
+  // Print out the normal passes. We add an extra layer of indentation here
+  // to help distinguish them visually from the immutable passes.
   for (SmallVector<PMDataManager *, 8>::const_iterator I = PassManagers.begin(),
          E = PassManagers.end(); I != E; ++I)
-    (*I)->getAsPass()->dumpPassStructure(1);
+    (*I)->dumpPassStructure(1);
 }
 
 void PMTopLevelManager::dumpArguments() const {
@@ -1041,7 +1049,7 @@ void PMDataManager::dumpLastUses(Pass *P, unsigned Offset) const{
   for (SmallVector<Pass *, 12>::iterator I = LUses.begin(),
          E = LUses.end(); I != E; ++I) {
     llvm::dbgs() << "--" << std::string(Offset*2, ' ');
-    (*I)->dumpPassStructure(0);
+    (*I)->dumpPass(0);
   }
 }
 
@@ -1409,7 +1417,7 @@ void FPPassManager::dumpPassStructure(unsigned Offset) {
   llvm::dbgs() << std::string(Offset*2, ' ') << "FunctionPass Manager\n";
   for (unsigned Index = 0; Index < getNumContainedPasses(); ++Index) {
     FunctionPass *FP = getContainedPass(Index);
-    FP->dumpPassStructure(Offset + 1);
+    FP->dumpPass(Offset + 1);
     dumpLastUses(FP, Offset+1);
   }
 }