Additional post-review fixes.

Author: allevato

include/swift/AST/Attr.h

@@ -1722,7 +1722,12 @@ class ImplementsAttr : public DeclAttribute {
                                 DeclName MemberName);
 
   ProtocolDecl *getProtocol(DeclContext *dc) const;
+
+  /// Returns the protocol declaration containing the requirement being
+  /// implemented by the attributed declaration if it has already been computed,
+  /// otherwise `nullopt`. This should only be used for dumping.
   std::optional<ProtocolDecl *> getCachedProtocol(DeclContext *dc) const;
+
   TypeRepr *getProtocolTypeRepr() const { return TyR; }
 
   DeclName getMemberName() const { return MemberName; }

include/swift/Option/Options.td

@@ -1351,7 +1351,9 @@ def dump_ast : Flag<["-"], "dump-ast">,
   HelpText<"Parse and type-check input file(s) and dump AST(s)">, ModeOpt,
   Flags<[FrontendOption, NoInteractiveOption, DoesNotAffectIncrementalBuild]>;
 def dump_ast_format : Separate<["-"], "dump-ast-format">,
-  HelpText<"Desired format for -dump-ast output ('default', 'json', or 'json-zlib')">,
+  HelpText<"Desired format for -dump-ast output "
+           "('default', 'json', or 'json-zlib'); no format is guaranteed "
+           "stable across different compiler versions">,
   MetaVarName<"<format>">,
   Flags<[FrontendOption, NoInteractiveOption, DoesNotAffectIncrementalBuild]>;
 def emit_ast : Flag<["-"], "emit-ast">, Alias<dump_ast>,

lib/AST/ASTDumper.cpp

@@ -2227,12 +2227,12 @@ namespace {
       if (Writer.isParsable()) {
         // Parsable outputs are meant to be used for semantic analysis, so we
         // want the full list of members, including macro-generated ones.
-        printList(IDC->getABIMembers(), [&](Decl *D, Label label) {
+        printList(IDC->getAllMembers(), [&](Decl *D, Label label) {
           printRec(D, label);
         }, Label::optional("members"));
       } else {
         auto members = ParseIfNeeded ? IDC->getMembers()
-                                    : IDC->getCurrentMembersWithoutLoading();
+                                     : IDC->getCurrentMembersWithoutLoading();
         printList(members, [&](Decl *D, Label label) {
           printRec(D, label);
         }, Label::optional("members"));
@@ -4794,7 +4794,7 @@ class PrintAttribute : public AttributeVisitor<PrintAttribute, void, Label>,
 
   void visitExecutionAttr(ExecutionAttr *Attr, Label label) {
     printCommon(Attr, "execution_attr", label);
-    printField(Attr->getBehavior(), "behavior");
+    printField(Attr->getBehavior(), Label::always("behavior"));
     printFoot();
   }
   void visitABIAttr(ABIAttr *Attr, Label label) {
@@ -5869,14 +5869,15 @@ namespace {
 #define VISIT_BINDABLE_NOMINAL_TYPE(TypeClass, Name)       \
     VISIT_NOMINAL_TYPE(TypeClass, Name)                    \
     void visitBoundGeneric##TypeClass(                     \
-        BoundGeneric##TypeClass *T, StringRef label) {     \
+        BoundGeneric##TypeClass *T, Label label) {         \
       printCommon("bound_generic_" #Name, label);          \
-      printFieldQuoted(T->getDecl()->printRef(), "decl");  \
+      printFieldQuoted(T->getDecl()->printRef(), Label::always("decl"));  \
       printFlag(T->getDecl()->hasClangNode(), "foreign");  \
       if (T->getParent())                                  \
-        printRec(T->getParent(), "parent");                \
-      for (auto arg : T->getGenericArgs())                 \
-        printRec(arg);                                     \
+        printRec(T->getParent(), Label::always("parent")); \
+      printList(T->getGenericArgs(), [&](auto arg, Label label) {  \
+        printRec(arg, label);                              \
+      }, Label::optional("generic_args"));                 \
       printFoot();                                         \
     }
 
@@ -5919,7 +5920,7 @@ namespace {
 
     void visitModuleType(ModuleType *T, Label label) {
       printCommon("module_type", label);
-      printDeclNameField(T->getModule(), Label::always("module"));
+      printDeclName(T->getModule(), Label::always("module"));
       printFlag(T->getModule()->isNonSwiftModule(), "foreign");
       printFoot();
     }
@@ -6042,7 +6043,7 @@ namespace {
     void printAnyFunctionParamsRec(ArrayRef<AnyFunctionType::Param> params,
                                    Label label) {
       printRecArbitrary([&](Label label) {
-        printCommon("function_params", FieldLabelColor, label);
+        printHead("function_params", FieldLabelColor, label);
 
         printField(params.size(), Label::always("num_params"));
         printList(params, [&](const auto &param, Label label) {

test/Frontend/ast-dump-json-output-map.swift

@@ -4,7 +4,7 @@
 // RUN: echo 'public func main() {a(); b()}' > %t/main.swift
 // RUN: echo "{\"%/t/a.swift\": {\"ast-dump\": \"%/t/a.ast\"}, \"%/t/b.swift\": {\"ast-dump\": \"%/t/b.ast\"}, \"%/t/main.swift\": {\"ast-dump\": \"%/t/main.ast\"}}" > %t/outputs.json
 
-// RUN: %target-build-swift -dump-ast -dump-ast-format json -output-file-map %t/outputs.json %t/a.swift %t/b.swift %t/main.swift -module-name main
+// RUN: %target-build-swift -dump-ast -dump-ast-format json -output-file-map %t/outputs.json %/t/a.swift %/t/b.swift %/t/main.swift -module-name main
 // RUN: %FileCheck -check-prefix A-AST %s < %t/a.ast
 // RUN: %FileCheck -check-prefix B-AST %s < %t/b.ast
 // RUN: %FileCheck -check-prefix MAIN-AST %s < %t/main.ast

test/Frontend/dump-parse.swift

@@ -112,9 +112,9 @@ struct SelfParam {
 
   // CHECK-LABEL: (func_decl range=[{{.+}}] "createOptional()" static
   // CHECK-NEXT:    (parameter "self")
-  // CHECK-NEXT:    (parameter_list range=[{{.+}}])
   // CHECK-NEXT:    (result=type_optional
   // CHECK-NEXT:      (type_unqualified_ident id="SelfParam" unbound))
+  // CHECK-NEXT:    (parameter_list range=[{{.+}}])
   static func createOptional() -> SelfParam? {
 
     // CHECK-LABEL: (call_expr type="<null>"
@@ -125,8 +125,8 @@ struct SelfParam {
 }
 
 // CHECK-LABEL: (func_decl range=[{{.+}}] "dumpMemberTypeRepr()"
-// CHECK-NEXT:    (parameter_list range=[{{.+}}])
 // CHECK-NEXT:    (result=type_qualified_ident id="Element" unbound
 // CHECK-NEXT:      (type_unqualified_ident id="Array" unbound
 // CHECK-NEXT:        (type_unqualified_ident id="Bool" unbound))
+// CHECK-NEXT:    (parameter_list range=[{{.+}}])
 func dumpMemberTypeRepr() -> Array<Bool>.Element { true }