replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Print out the union field being initialized by an InitListExpr when dumping the AST to JSON. 

llvm-svn: 363869
This commit is contained in:
Aaron Ballman 2019-06-19 19:40:07 +00:00
parent 40a156b791
commit 709a769cdd
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clang/include/clang/AST/JSONNodeDumper.h
View File

@ -251,6 +251,7 @@ public:
void VisitAddrLabelExpr(const AddrLabelExpr *ALE); void VisitAddrLabelExpr(const AddrLabelExpr *ALE);
void VisitCXXTypeidExpr(const CXXTypeidExpr *CTE); void VisitCXXTypeidExpr(const CXXTypeidExpr *CTE);
void VisitConstantExpr(const ConstantExpr *CE); void VisitConstantExpr(const ConstantExpr *CE);
void VisitInitListExpr(const InitListExpr *ILE);
void VisitIntegerLiteral(const IntegerLiteral *IL); void VisitIntegerLiteral(const IntegerLiteral *IL);
void VisitCharacterLiteral(const CharacterLiteral *CL); void VisitCharacterLiteral(const CharacterLiteral *CL);

5
clang/lib/AST/JSONNodeDumper.cpp
View File

@ -984,6 +984,11 @@ void JSONNodeDumper::VisitConstantExpr(const ConstantExpr *CE) {
} }
} }
void JSONNodeDumper::VisitInitListExpr(const InitListExpr *ILE) {
if (const FieldDecl *FD = ILE->getInitializedFieldInUnion())
JOS.attribute("field", createBareDeclRef(FD));
}
void JSONNodeDumper::VisitIntegerLiteral(const IntegerLiteral *IL) { void JSONNodeDumper::VisitIntegerLiteral(const IntegerLiteral *IL) {
JOS.attribute("value", JOS.attribute("value",
IL->getValue().toString( IL->getValue().toString(

19
clang/test/AST/ast-dump-stmt-json.cpp
View File

@ -2415,7 +2415,15 @@ void TestIteration() {
// CHECK-NEXT: "type": { // CHECK-NEXT: "type": {
// CHECK-NEXT: "qualType": "U" // CHECK-NEXT: "qualType": "U"
// CHECK-NEXT: }, // CHECK-NEXT: },
// CHECK-NEXT: "valueCategory": "rvalue" // CHECK-NEXT: "valueCategory": "rvalue",
// CHECK-NEXT: "field": {
// CHECK-NEXT: "id": "0x{{.*}}",
// CHECK-NEXT: "kind": "FieldDecl",
// CHECK-NEXT: "name": "i",
// CHECK-NEXT: "type": {
// CHECK-NEXT: "qualType": "int"
// CHECK-NEXT: }
// CHECK-NEXT: }
// CHECK-NEXT: }, // CHECK-NEXT: },
// CHECK-NEXT: { // CHECK-NEXT: {
// CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "id": "0x{{.*}}",
@ -2436,6 +2444,14 @@ void TestIteration() {
// CHECK-NEXT: "qualType": "U" // CHECK-NEXT: "qualType": "U"
// CHECK-NEXT: }, // CHECK-NEXT: },
// CHECK-NEXT: "valueCategory": "rvalue", // CHECK-NEXT: "valueCategory": "rvalue",
// CHECK-NEXT: "field": {
// CHECK-NEXT: "id": "0x{{.*}}",
// CHECK-NEXT: "kind": "FieldDecl",
// CHECK-NEXT: "name": "i",
// CHECK-NEXT: "type": {
// CHECK-NEXT: "qualType": "int"
// CHECK-NEXT: }
// CHECK-NEXT: },
// CHECK-NEXT: "inner": [ // CHECK-NEXT: "inner": [
// CHECK-NEXT: { // CHECK-NEXT: {
// CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "id": "0x{{.*}}",
@ -5975,4 +5991,3 @@ void TestIteration() {
// CHECK-NEXT: } // CHECK-NEXT: }
// CHECK-NEXT: ] // CHECK-NEXT: ]
// CHECK-NEXT: } // CHECK-NEXT: }