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

[Stepan Dyatkovskiy via Phabricator via cfe-commits]

dyatkovskiy updated this revision to Diff 198771.
dyatkovskiy added a comment.

Patch updates per review remarks


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D61566/new/

https://reviews.llvm.org/D61566

Files:
  clang/lib/AST/DeclPrinter.cpp
  clang/test/AST/ast-print-record-decl.c


Index: clang/test/AST/ast-print-record-decl.c
===================================================================
--- clang/test/AST/ast-print-record-decl.c
+++ clang/test/AST/ast-print-record-decl.c
@@ -289,3 +289,21 @@
 
 // A tag decl group in the tag decl's own member list is exercised in
 // defSelfRef above.
+
+#ifdef __cplusplus
+// PRINT-CXX-LABEL: outOfRecordDef
+void outOfRecordDef () {
+
+  // PRINT-CXX-NEXT: struct DeclEnclosing {
+  // PRINT-CXX-NEXT: struct DeclMember;
+  // PRINT-CXX-NEXT: };
+  struct DeclEnclosing {
+    struct DeclMember;
+  };
+
+  // PRINT-CXX-NEXT: struct DeclEnclosing::DeclMember {
+  // PRINT-CXX-NEXT: };
+  struct DeclEnclosing::DeclMember {
+  };
+}
+#endif
Index: clang/lib/AST/DeclPrinter.cpp
===================================================================
--- clang/lib/AST/DeclPrinter.cpp
+++ clang/lib/AST/DeclPrinter.cpp
@@ -953,7 +953,12 @@
   prettyPrintAttributes(D);
 
   if (D->getIdentifier()) {
-    Out << ' ' << *D;
+    Out << ' ';
+
+    if (const NestedNameSpecifier *Q = D->getQualifier())
+      Q->print(Out, Policy);
+
+    Out << *D;
 
     if (auto S = dyn_cast<ClassTemplatePartialSpecializationDecl>(D))
       printTemplateArguments(S->getTemplateArgs(), S->getTemplateParameters());



Index: clang/test/AST/ast-print-record-decl.c
===================================================================
--- clang/test/AST/ast-print-record-decl.c
+++ clang/test/AST/ast-print-record-decl.c
@@ -289,3 +289,21 @@
 
 // A tag decl group in the tag decl's own member list is exercised in
 // defSelfRef above.
+
+#ifdef __cplusplus
+// PRINT-CXX-LABEL: outOfRecordDef
+void outOfRecordDef () {
+
+  // PRINT-CXX-NEXT: struct DeclEnclosing {
+  // PRINT-CXX-NEXT: struct DeclMember;
+  // PRINT-CXX-NEXT: };
+  struct DeclEnclosing {
+    struct DeclMember;
+  };
+
+  // PRINT-CXX-NEXT: struct DeclEnclosing::DeclMember {
+  // PRINT-CXX-NEXT: };
+  struct DeclEnclosing::DeclMember {
+  };
+}
+#endif
Index: clang/lib/AST/DeclPrinter.cpp
===================================================================
--- clang/lib/AST/DeclPrinter.cpp
+++ clang/lib/AST/DeclPrinter.cpp
@@ -953,7 +953,12 @@
   prettyPrintAttributes(D);
 
   if (D->getIdentifier()) {
-    Out << ' ' << *D;
+    Out << ' ';
+
+    if (const NestedNameSpecifier *Q = D->getQualifier())
+      Q->print(Out, Policy);
+
+    Out << *D;
 
     if (auto S = dyn_cast<ClassTemplatePartialSpecializationDecl>(D))
       printTemplateArguments(S->getTemplateArgs(), S->getTemplateParameters());

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits