[clang] Add cleanup_function field to CleanupAttr json AST dump

[aaron.ballman]

LGTM!

[paulkirth]

Hi, we're seeing a test failure in our CI after this stack. Not exactly sure which commit though.

You can find the failing bot here:
https://luci-milo.appspot.com/ui/p/fuchsia/builders/toolchain.ci/clang-linux-x64-rbe/b8772753421607483249/overview

Some test output from Clang :: AST/ast-dump-stmt-json.cpp:

Script:
--
: 'RUN: at line 1';   /b/s/w/ir/x/w/llvm_build/bin/clang -cc1 -internal-isystem /b/s/w/ir/x/w/llvm_build/lib/clang/18/include -nostdsysteminc -std=c++2a -triple x86_64-linux-gnu -fcxx-exceptions -ast-dump=json /b/s/w/ir/x/w/llvm-llvm-project/clang/test/AST/ast-dump-stmt-json.cpp | /b/s/w/ir/x/w/llvm_build/bin/FileCheck /b/s/w/ir/x/w/llvm-llvm-project/clang/test/AST/ast-dump-stmt-json.cpp
--
Exit Code: 1

Command Output (stderr):
--
/b/s/w/ir/x/w/llvm-llvm-project/clang/test/AST/ast-dump-stmt-json.cpp:1471:16: error: CHECK-NEXT: is not on the line after the previous match
// CHECK-NEXT: },
               ^
<stdin>:1555:2: note: 'next' match was here
 },
 ^
<stdin>:1553:18: note: previous match ended here
 "implicit": true,
                 ^
<stdin>:1554:1: note: non-matching line after previous match is here
 "visibility": "default"
^

Input file: <stdin>
Check file: /b/s/w/ir/x/w/llvm-llvm-project/clang/test/AST/ast-dump-stmt-json.cpp

-dump-input=help explains the following input dump.

Input was:
<<<<<<
           .
           .
           .
        1550:  "begin": {}, 
        1551:  "end": {} 
        1552:  }, 
        1553:  "implicit": true, 
        1554:  "visibility": "default" 
        1555:  }, 
next:1471      !~  error: match on wrong line
        1556:  { 
        1557:  "id": "0x558ee63a5d00", 
        1558:  "kind": "ReturnsNonNullAttr", 
        1559:  "range": { 
        1560:  "begin": {}, 
           .
           .
           .
>>>>>>

--

clang/include/clang/AST/JSONNodeDumper.h

public:
   void Visit(const CXXCtorInitializer *Init);
   void Visit(const OMPClause *C);
   void Visit(const BlockDecl::Capture &C);
   void Visit(const GenericSelectionExpr::ConstAssociation &A);
   void Visit(const concepts::Requirement *R);
   void Visit(const APValue &Value, QualType Ty);
 
   void VisitAliasAttr(const AliasAttr *AA);
+  void VisitCleanupAttr(const CleanupAttr *CA);
 
   void VisitTypedefType(const TypedefType *TT);
   void VisitUsingType(const UsingType *TT);
   void VisitFunctionType(const FunctionType *T);
   void VisitFunctionProtoType(const FunctionProtoType *T);
   void VisitRValueReferenceType(const ReferenceType *RT);
   void VisitArrayType(const ArrayType *AT);
   void VisitConstantArrayType(const ConstantArrayType *CAT);

clang/lib/AST/JSONNodeDumper.cpp

JSONNodeDumper::createCXXBaseSpecifier(const CXXBaseSpecifier &BS) {
 
   return Ret;
 }
 
 void JSONNodeDumper::VisitAliasAttr(const AliasAttr *AA) {
   JOS.attribute("aliasee", AA->getAliasee());
 }
 
+void JSONNodeDumper::VisitCleanupAttr(const CleanupAttr *CA) {
+  JOS.attribute("cleanup_function", createBareDeclRef(CA->getFunctionDecl()));
+}
+
 void JSONNodeDumper::VisitTypedefType(const TypedefType *TT) {
   JOS.attribute("decl", createBareDeclRef(TT->getDecl()));
   if (!TT->typeMatchesDecl())
     JOS.attribute("type", createQualType(TT->desugar()));
 }
 
 void JSONNodeDumper::VisitUsingType(const UsingType *TT) {
   JOS.attribute("decl", createBareDeclRef(TT->getFoundDecl()));

clang/test/AST/ast-dump-attr-json.cpp

 // RUN: %clang_cc1 -Wdocumentation -ast-dump=json %s | FileCheck %s
 
 int global_decl;
 extern __attribute__((alias("global_decl"))) int global_alias;
 
+void cleanup_function(int*);
+void some() {
+  __attribute__((cleanup(cleanup_function))) int var;
+}
+
 // NOTE: CHECK lines have been autogenerated by gen_ast_dump_json_test.py
 // using --filters=VarDecl
 
 
 // CHECK-NOT: {{^}}Dumping
 // CHECK:  "kind": "VarDecl",
 // CHECK-NEXT:  "loc": {
 // CHECK-NEXT:   "offset": 73,

 // CHECK-NEXT:      "tokLen": 5
 // CHECK-NEXT:     },
 // CHECK-NEXT:     "end": {
 // CHECK-NEXT:      "offset": 127,
 // CHECK-NEXT:      "col": 42,
 // CHECK-NEXT:      "tokLen": 1
 // CHECK-NEXT:     }
 // CHECK-NEXT:    },
-// CHECK-NEXT:    "decl": "global_decl"
+// CHECK-NEXT:    "aliasee": "global_decl"
+// CHECK-NEXT:   }
+// CHECK-NEXT:  ]
+// CHECK-NEXT: }
+
+
+// CHECK-NOT: {{^}}Dumping
+// CHECK:  "kind": "VarDecl",
+// CHECK-NEXT:  "loc": {
+// CHECK-NEXT:   "offset": 242,
+// CHECK-NEXT:   "col": 50,
+// CHECK-NEXT:   "tokLen": 3
+// CHECK-NEXT:  },
+// CHECK-NEXT:  "range": {
+// CHECK-NEXT:   "begin": {
+// CHECK-NEXT:    "offset": 195,
+// CHECK-NEXT:    "col": 3,
+// CHECK-NEXT:    "tokLen": 13
+// CHECK-NEXT:   },
+// CHECK-NEXT:   "end": {
+// CHECK-NEXT:    "offset": 242,
+// CHECK-NEXT:    "col": 50,
+// CHECK-NEXT:    "tokLen": 3
+// CHECK-NEXT:   }
+// CHECK-NEXT:  },
+// CHECK-NEXT:  "name": "var",
+// CHECK-NEXT:  "type": {
+// CHECK-NEXT:   "qualType": "int"
+// CHECK-NEXT:  },
+// CHECK-NEXT:  "inner": [
+// CHECK-NEXT:   {
+// CHECK-NEXT:    "id": "0x{{.*}}",
+// CHECK-NEXT:    "kind": "CleanupAttr",
+// CHECK-NEXT:    "range": {
+// CHECK-NEXT:     "begin": {
+// CHECK-NEXT:      "offset": 210,
+// CHECK-NEXT:      "col": 18,
+// CHECK-NEXT:      "tokLen": 7
+// CHECK-NEXT:     },
+// CHECK-NEXT:     "end": {
+// CHECK-NEXT:      "offset": 234,
+// CHECK-NEXT:      "col": 42,
+// CHECK-NEXT:      "tokLen": 1
+// CHECK-NEXT:     }
+// CHECK-NEXT:    },
+// CHECK-NEXT:    "cleanup_function": {
+// CHECK-NEXT:     "id": "0x{{.*}}",
+// CHECK-NEXT:     "kind": "FunctionDecl",
+// CHECK-NEXT:     "name": "cleanup_function",
+// CHECK-NEXT:     "type": {
+// CHECK-NEXT:      "qualType": "void (int *)"
+// CHECK-NEXT:     }
+// CHECK-NEXT:    }
 // CHECK-NEXT:   }
 // CHECK-NEXT:  ]
 // CHECK-NEXT: }