[clang] Add missing field to VisibilityAttr json AST dump

[serge-sans-paille]

Fix typo in example

[aaron.ballman]

LGTM!

[dyung]

Hi @serge-sans-paille, your change is causing the test you modified, clang/test/AST/ast-dump-attr-json.cpp to fail. Can you take a look?

https://lab.llvm.org/buildbot/#/builders/139/builds/47461
https://lab.llvm.org/buildbot/#/builders/109/builds/71264

[thakis]

Hello, one of the many dump commits broke tests on macOS: http://45.33.8.238/macm1/67030/step_7.txt

Please take a look and revert for now if it takes a while to fix.

Also, consider spreading out commits a bit so that if one breaks something, it's easily to see which one it was.

[thakis]

In D157808#4587014, @thakis wrote:

Hello, one of the many dump commits broke tests on macOS: http://45.33.8.238/macm1/67030/step_7.txt

Please take a look and revert for now if it takes a while to fix.

Also, consider spreading out commits a bit so that if one breaks something, it's easily to see which one it was.

Turns out the failure is from D157775. Tests have been broken on mac for over 13 hours now. Could you please take a look?

I'll revert D157775 and follow-ups causing conflicts if it's still broken in another 2h.

[hans]

Since reverting seems non-trivial, I added a triple in https://github.com/llvm/llvm-project/commit/7a1735cd05c2bc0c336f122f01fb35de66e85e16 which I believe should fix the test.

[DavidSpickett]

We also had a failure looking for the mangled name on Windows on Arm: https://lab.llvm.org/buildbot/#/builders/65/builds/10954

The triple fix may take care of that too.

Also, consider spreading out commits a bit so that if one breaks something, it's easily to see which one it was.

Definitely.

Another option for dependent patches that must go in together is to add [1/N] so we know it's essentially one large change, and can revert accordingly.

clang/include/clang/AST/JSONNodeDumper.h

public:
   void Visit(const concepts::Requirement *R);
   void Visit(const APValue &Value, QualType Ty);
 
   void VisitAliasAttr(const AliasAttr *AA);
   void VisitCleanupAttr(const CleanupAttr *CA);
   void VisitDeprecatedAttr(const DeprecatedAttr *DA);
   void VisitUnavailableAttr(const UnavailableAttr *UA);
   void VisitSectionAttr(const SectionAttr *SA);
+  void VisitVisibilityAttr(const VisibilityAttr *VA);
 
   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

void JSONNodeDumper::VisitUnavailableAttr(const UnavailableAttr *UA) {
   if (!UA->getMessage().empty())
     JOS.attribute("message", UA->getMessage());
 }
 
 void JSONNodeDumper::VisitSectionAttr(const SectionAttr *SA) {
   JOS.attribute("section_name", SA->getName());
 }
 
+void JSONNodeDumper::VisitVisibilityAttr(const VisibilityAttr *VA) {
+  JOS.attribute("visibility", VisibilityAttr::ConvertVisibilityTypeToStr(
+                                  VA->getVisibility()));
+}
+
 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

 __attribute__((deprecated("reason"))) int deprecated_var1;
 __attribute__((deprecated("reason", "replacement"))) int deprecated_var2;
 
 __attribute__((unavailable)) int unavailable_var0;
 __attribute__((unavailable("reason"))) int unavailable_var1;
 
 __attribute__ ((section ("SECTION_NAME"))) int section_var;
 
+__attribute__ ((visibility ("hidden"))) int visibility_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:      "col": 40,
 // CHECK-NEXT:      "tokLen": 1
 // CHECK-NEXT:     }
 // CHECK-NEXT:    },
 // CHECK-NEXT:    "section_name": "SECTION_NAME"
 // CHECK-NEXT:   }
 // CHECK-NEXT:  ]
 // CHECK-NEXT: }
+
+
+// CHECK-NOT: {{^}}Dumping
+// CHECK:  "kind": "VarDecl",
+// CHECK-NEXT:  "loc": {
+// CHECK-NEXT:   "offset": 651,
+// CHECK-NEXT:   "line": 20,
+// CHECK-NEXT:   "col": 45,
+// CHECK-NEXT:   "tokLen": 14
+// CHECK-NEXT:  },
+// CHECK-NEXT:  "range": {
+// CHECK-NEXT:   "begin": {
+// CHECK-NEXT:    "offset": 607,
+// CHECK-NEXT:    "col": 1,
+// CHECK-NEXT:    "tokLen": 13
+// CHECK-NEXT:   },
+// CHECK-NEXT:   "end": {
+// CHECK-NEXT:    "offset": 651,
+// CHECK-NEXT:    "col": 45,
+// CHECK-NEXT:    "tokLen": 14
+// CHECK-NEXT:   }
+// CHECK-NEXT:  },
+// CHECK-NEXT:  "name": "visibility_var",
+// CHECK-NEXT:  "mangledName": "visibility_var",
+// CHECK-NEXT:  "type": {
+// CHECK-NEXT:   "qualType": "int"
+// CHECK-NEXT:  },
+// CHECK-NEXT:  "inner": [
+// CHECK-NEXT:   {
+// CHECK-NEXT:    "id": "0x{{.*}}",
+// CHECK-NEXT:    "kind": "VisibilityAttr",
+// CHECK-NEXT:    "range": {
+// CHECK-NEXT:     "begin": {
+// CHECK-NEXT:      "offset": 623,
+// CHECK-NEXT:      "col": 17,
+// CHECK-NEXT:      "tokLen": 10
+// CHECK-NEXT:     },
+// CHECK-NEXT:     "end": {
+// CHECK-NEXT:      "offset": 643,
+// CHECK-NEXT:      "col": 37,
+// CHECK-NEXT:      "tokLen": 1
+// CHECK-NEXT:     }
+// CHECK-NEXT:    },
+// CHECK-NEXT:    "visibility": "hidden"
+// CHECK-NEXT:   }
+// CHECK-NEXT:  ]
+// CHECK-NEXT: }