Add dumpMethodDeclOverrides to NodeDumper

[aaron.ballman]

LGTM, aside from a minor nit.

lib/AST/ASTDumper.cpp

921

Elide braces, and since you're touching the line, might as well do const auto *.

[steveire]

Abandoning this because it's not really the right approach as it appears in the interface between the generic traverser and the generic node dumper, which it really shouldn't.

include/clang/AST/TextNodeDumper.h

public:
   void dumpSourceRange(SourceRange R);
   void dumpBareType(QualType T, bool Desugar = true);
   void dumpType(QualType T);
   void dumpBareDeclRef(const Decl *D);
   void dumpName(const NamedDecl *ND);
   void dumpAccessSpecifier(AccessSpecifier AS);
   void dumpCXXTemporary(const CXXTemporary *Temporary);
   void dumpFunctionDeclParameters(const FunctionDecl *D);
+  void dumpMethodDeclOverrides(const CXXMethodDecl *D);
 
   void dumpDeclRef(const Decl *D, const char *Label = nullptr);
 
   void visitTextComment(const comments::TextComment *C,
                         const comments::FullComment *);
   void visitInlineCommandComment(const comments::InlineCommandComment *C,
                                  const comments::FullComment *);
   void visitHTMLStartTagComment(const comments::HTMLStartTagComment *C,

lib/AST/ASTDumper.cpp

public:
     void dumpLookups(const DeclContext *DC, bool DumpDecls);
     void dumpAttr(const Attr *A);
     void dumpFunctionDeclParameters(const FunctionDecl *D) {
       NodeDumper.dumpFunctionDeclParameters(D);
       if (D->param_begin() || !D->getNumParams())
         for (const ParmVarDecl *Parameter : D->parameters())
           dumpDecl(Parameter);
     }
+    void dumpMethodDeclOverrides(const CXXMethodDecl *D) {
+      NodeDumper.dumpMethodDeclOverrides(D);
+    }
 
     // C++ Utilities
     void dumpCXXCtorInitializer(const CXXCtorInitializer *Init);
     void dumpTemplateParameters(const TemplateParameterList *TPL);
     void dumpTemplateArgumentListInfo(const TemplateArgumentListInfo &TALI);
     void dumpTemplateArgumentLoc(const TemplateArgumentLoc &A,
                                  const Decl *From = nullptr,
                                  const char *label = nullptr);
void ASTDumper::VisitFunctionDecl(const FunctionDecl *D) {
   dumpFunctionDeclParameters(D);
 
   if (const CXXConstructorDecl *C = dyn_cast<CXXConstructorDecl>(D))
     for (CXXConstructorDecl::init_const_iterator I = C->init_begin(),
                                                  E = C->init_end();
          I != E; ++I)
       dumpCXXCtorInitializer(*I);
 
   if (const CXXMethodDecl *MD = dyn_cast<CXXMethodDecl>(D)) {
-    if (MD->size_overridden_methods() != 0) {
-      auto dumpOverride = [=](const CXXMethodDecl *D) {
-        SplitQualType T_split = D->getType().split();
-        OS << D << " " << D->getParent()->getName()
-           << "::" << D->getNameAsString() << " '"
-           << QualType::getAsString(T_split, PrintPolicy) << "'";
-      };
-
-      dumpChild([=] {
-        auto Overrides = MD->overridden_methods();
-        OS << "Overrides: [ ";
-        dumpOverride(*Overrides.begin());
-        for (const auto *Override :
-             llvm::make_range(Overrides.begin() + 1, Overrides.end())) {
-          OS << ", ";
-          dumpOverride(Override);
-        }
-        OS << " ]";
-      });
-    }
+    dumpMethodDeclOverrides(MD);
   }
 
   if (D->doesThisDeclarationHaveABody())
     dumpStmt(D->getBody());
 }
 
 void ASTDumper::VisitFieldDecl(const FieldDecl *D) {
   NodeDumper.dumpName(D);

lib/AST/TextNodeDumper.cpp

 }
 
 void TextNodeDumper::dumpFunctionDeclParameters(const FunctionDecl *D) {
   if (!D->param_begin() && D->getNumParams())
     TreeStructure.addChild(
         [=] { OS << "<<NULL params x " << D->getNumParams() << ">>"; });
 }
 
+void TextNodeDumper::dumpMethodDeclOverrides(const CXXMethodDecl *D) {
+  if (D->size_overridden_methods() != 0) {
+    auto dumpOverride = [=](const CXXMethodDecl *D) {
+      SplitQualType T_split = D->getType().split();
+      OS << D << " " << D->getParent()->getName()
+         << "::" << D->getNameAsString() << " '"
+         << QualType::getAsString(T_split, PrintPolicy) << "'";
+    };
+
+    TreeStructure.addChild([=] {
+      auto Overrides = D->overridden_methods();
+      OS << "Overrides: [ ";
+      dumpOverride(*Overrides.begin());
+      for (const auto *Override :
+           llvm::make_range(Overrides.begin() + 1, Overrides.end())) {
+        OS << ", ";
+        dumpOverride(Override);
+      }
+      OS << " ]";
+    });
+  }
+}
+
 void TextNodeDumper::dumpDeclRef(const Decl *D, const char *Label) {
   if (!D)
     return;
 
   TreeStructure.addChild([=] {
     if (Label)
       OS << Label << ' ';
     dumpBareDeclRef(D);