Fix for bug 41747: AST Printer doesn't print nested name specifier for out of scope record definitions

[dyatkovskiy]

Summary

This fix adds out of scope member classes definitions support for AST Printer.

[dyatkovskiy]

@jdenny ? @sepavloff ?
ping

[jdenny]

LGTM except for nits in the tests. I'm not close to C++ support in Clang, so please give other reviewers a few days to comment just in case. I've added a couple who have reviewed my patches in this area in the past.

Thanks for the fix!

clang/test/AST/ast-print-record-decl.c

303

To make this easier to read (especially in editors without highlighting), I suggest putting all FileCheck directives for the definition of each of struct DeclEnclosing and struct DeclEnclosing::DeclMember before that definition.

307

This comment should stay next to DeclGroupInMemberList because they're both about tag decl groups in member lists.

[aaron.ballman]

clang/lib/AST/DeclPrinter.cpp

958

Don't use auto here as the type is not explicitly spelled out in the initialization. If possible, const-qualify the pointer type as well.

[dyatkovskiy]

Patch updates per review remarks

[aaron.ballman]

LGTM!

clang/lib/AST/DeclPrinter.cpp

void DeclPrinter::VisitCXXRecordDecl(CXXRecordDecl *D) {
   // FIXME: add printing of pragma attributes if required.
   if (!Policy.SuppressSpecifiers && D->isModulePrivate())
     Out << "__module_private__ ";
   Out << D->getKindName();
 
   prettyPrintAttributes(D);
 
   if (D->getIdentifier()) {
-    Out << ' ' << *D;
+    Out << ' ';
+
+    if (auto *Q = D->getQualifier())
+      Q->print(Out, Policy);
+
+    Out << *D;
 
     if (auto S = dyn_cast<ClassTemplatePartialSpecializationDecl>(D))
       printTemplateArguments(S->getTemplateArgs(), S->getTemplateParameters());
     else if (auto S = dyn_cast<ClassTemplateSpecializationDecl>(D))
       printTemplateArguments(S->getTemplateArgs());
   }
 
   if (D->isCompleteDefinition()) {

clang/test/AST/ast-print-record-decl.c

KW DeclGroupInMemberList {
   union T2 { int i; } *t20, t21[2];
   // PRINT-NEXT:  enum T3 {
   // PRINT-NEXT:    T30
   // PRINT-NEXT:  } t30;
   enum T3 { T30 } t30;
   // PRINT-NEXT: };
 };
 
+#ifdef __cplusplus
+// PRINT-CXX-LABEL: outOfRecordDef
+void outOfRecordDef () {
+  // PRINT-CXX-NEXT: struct DeclEnclosing {
+  struct DeclEnclosing {
+    // PRINT-CXX-NEXT: struct DeclMember;
+    struct DeclMember;
+  // PRINT-CXX-NEXT: };
+  };
+  // PRINT-CXX-NEXT: struct DeclEnclosing::DeclMember {
+  struct DeclEnclosing::DeclMember {
+  // PRINT-CXX-NEXT: };
+  };
+}
+#endif
+
 // A tag decl group in the tag decl's own member list is exercised in
 // defSelfRef above.