This is an archive of the discontinued LLVM Phabricator instance.

Differential D67057

[AST][JSON] Generate parent context id from Decl* instead of DeclContext*
ClosedPublic

Authored by piscisaureus on Sep 1 2019, 6:14 PM.

Details

Reviewers
aaron.ballman
lebedev.ri
Summary

Because of multiple inheritance, a DeclContext pointer does not produce
the same pointer representation as a Decl pointer that references the
same AST Node.

When dumping the parentDeclContextId field of a node, convert the pointer
to Decl* first, so the id can be used to find the AST node it references.

Diff Detail

Event Timeline

piscisaureus created this revision.Sep 1 2019, 6:14 PM
Herald added a project: Restricted Project. · View Herald TranscriptSep 1 2019, 6:14 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
piscisaureus added a reviewer: lebedev.ri.Sep 3 2019, 2:14 PM
aaron.ballman accepted this revision.Sep 4 2019, 6:11 AM

LGTM aside from a small nit. Thank you for this!

clang/lib/AST/JSONNodeDumper.cpp
118

const auto *

This revision is now accepted and ready to land.Sep 4 2019, 6:11 AM
piscisaureus updated this revision to Diff 218770.Sep 4 2019, 12:47 PM

fix nit

piscisaureus marked an inline comment as done.Sep 4 2019, 12:49 PM

Fixed nit, this is ready to land IMO.

aaron.ballman closed this revision.Sep 4 2019, 1:28 PM
In D67057#1658217, @piscisaureus wrote:

Fixed nit, this is ready to land IMO.

Thanks! I've commit on your behalf in r370970.

Revision Contents

Diff 218770

clang/lib/AST/JSONNodeDumper.cpp

Show First 20 Lines • Show All 105 Lines • ▼ Show 20 Linesvoid JSONNodeDumper::Visit(const Decl *D) {
if (D->isUsed()) if (D->isUsed())
JOS.attribute("isUsed", true); JOS.attribute("isUsed", true);
else if (D->isThisDeclarationReferenced()) else if (D->isThisDeclarationReferenced())
JOS.attribute("isReferenced", true); JOS.attribute("isReferenced", true);
if (const auto *ND = dyn_cast<NamedDecl>(D)) if (const auto *ND = dyn_cast<NamedDecl>(D))
attributeOnlyIfTrue("isHidden", ND->isHidden()); attributeOnlyIfTrue("isHidden", ND->isHidden());
if (D->getLexicalDeclContext() != D->getDeclContext()) if (D->getLexicalDeclContext() != D->getDeclContext()) {
JOS.attribute("parentDeclContext", // Because of multiple inheritance, a DeclContext pointer does not produce
createPointerRepresentation(D->getDeclContext())); // the same pointer representation as a Decl pointer that references the
// same AST Node.
const auto *ParentDeclContextDecl = dyn_cast<Decl>(D->getDeclContext());
aaron.ballmanUnsubmitted
Done
ReplyInline Actions

const auto *

aaron.ballman: `const auto *`
JOS.attribute("parentDeclContextId",
createPointerRepresentation(ParentDeclContextDecl));
}
addPreviousDeclaration(D); addPreviousDeclaration(D);
InnerDeclVisitor::Visit(D); InnerDeclVisitor::Visit(D);
} }
void JSONNodeDumper::Visit(const comments::Comment *C, void JSONNodeDumper::Visit(const comments::Comment *C,
const comments::FullComment *FC) { const comments::FullComment *FC) {
if (!C) if (!C)
▲ Show 20 Lines • Show All 1,451 Lines • Show Last 20 Lines

clang/test/AST/ast-dump-decl-context-json.cpp

  • This file was added.
// RUN: %clang_cc1 -triple x86_64-unknown-unknown -ast-dump=json -ast-dump-filter Test %s | FileCheck %s
namespace Test {
namespace NS {
void Function();
}
void NS::Function() {}
struct S {
void Method();
};
void S::Method() {}
} // namespace Test
// CHECK: "kind": "NamespaceDecl",
// CHECK-NEXT: "loc": {
// CHECK-NEXT: "file": "{{.*}}",
// CHECK-NEXT: "line": 3,
// CHECK-NEXT: "col": 11,
// CHECK-NEXT: "tokLen": 4
// CHECK-NEXT: },
// CHECK-NEXT: "range": {
// CHECK-NEXT: "begin": {
// CHECK-NEXT: "col": 1,
// CHECK-NEXT: "tokLen": 9
// CHECK-NEXT: },
// CHECK-NEXT: "end": {
// CHECK-NEXT: "line": 15,
// CHECK-NEXT: "col": 1,
// CHECK-NEXT: "tokLen": 1
// CHECK-NEXT: }
// CHECK-NEXT: },
// CHECK-NEXT: "name": "Test",
// CHECK-NEXT: "inner": [
// CHECK-NEXT: {
// CHECK-NEXT: "id": "0x[[NS_ID:.*]]",
// CHECK-NEXT: "kind": "NamespaceDecl",
// CHECK-NEXT: "loc": {
// CHECK-NEXT: "line": 5,
// CHECK-NEXT: "col": 11,
// CHECK-NEXT: "tokLen": 2
// CHECK-NEXT: },
// CHECK-NEXT: "range": {
// CHECK-NEXT: "begin": {
// CHECK-NEXT: "col": 1,
// CHECK-NEXT: "tokLen": 9
// CHECK-NEXT: },
// CHECK-NEXT: "end": {
// CHECK-NEXT: "line": 7,
// CHECK-NEXT: "col": 1,
// CHECK-NEXT: "tokLen": 1
// CHECK-NEXT: }
// CHECK-NEXT: },
// CHECK-NEXT: "name": "NS",
// CHECK-NEXT: "inner": [
// CHECK-NEXT: {
// CHECK-NEXT: "id": "0x[[FUNCTION_ID:.*]]",
// CHECK-NEXT: "kind": "FunctionDecl",
// CHECK-NEXT: "loc": {
// CHECK-NEXT: "line": 6,
// CHECK-NEXT: "col": 6,
// CHECK-NEXT: "tokLen": 8
// CHECK-NEXT: },
// CHECK-NEXT: "range": {
// CHECK-NEXT: "begin": {
// CHECK-NEXT: "col": 1,
// CHECK-NEXT: "tokLen": 4
// CHECK-NEXT: },
// CHECK-NEXT: "end": {
// CHECK-NEXT: "col": 15,
// CHECK-NEXT: "tokLen": 1
// CHECK-NEXT: }
// CHECK-NEXT: },
// CHECK-NEXT: "name": "Function",
// CHECK-NEXT: "type": {
// CHECK-NEXT: "qualType": "void ()"
// CHECK-NEXT: }
// CHECK-NEXT: }
// CHECK-NEXT: ]
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "id": "0x{{.*}}",
// CHECK-NEXT: "kind": "FunctionDecl",
// CHECK-NEXT: "loc": {
// CHECK-NEXT: "line": 8,
// CHECK-NEXT: "col": 10,
// CHECK-NEXT: "tokLen": 8
// CHECK-NEXT: },
// CHECK-NEXT: "range": {
// CHECK-NEXT: "begin": {
// CHECK-NEXT: "col": 1,
// CHECK-NEXT: "tokLen": 4
// CHECK-NEXT: },
// CHECK-NEXT: "end": {
// CHECK-NEXT: "col": 22,
// CHECK-NEXT: "tokLen": 1
// CHECK-NEXT: }
// CHECK-NEXT: },
// CHECK-NEXT: "parentDeclContextId": "0x[[NS_ID]]",
// CHECK-NEXT: "previousDecl": "0x[[FUNCTION_ID]]",
// CHECK-NEXT: "name": "Function",
// CHECK-NEXT: "type": {
// CHECK-NEXT: "qualType": "void ()"
// CHECK-NEXT: },
// CHECK-NEXT: "inner": [
// CHECK-NEXT: {
// CHECK-NEXT: "id": "0x{{.*}}",
// CHECK-NEXT: "kind": "CompoundStmt",
// CHECK-NEXT: "range": {
// CHECK-NEXT: "begin": {
// CHECK-NEXT: "col": 21,
// CHECK-NEXT: "tokLen": 1
// CHECK-NEXT: },
// CHECK-NEXT: "end": {
// CHECK-NEXT: "col": 22,
// CHECK-NEXT: "tokLen": 1
// CHECK-NEXT: }
// CHECK-NEXT: }
// CHECK-NEXT: }
// CHECK-NEXT: ]
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "id": "0x[[S_ID:.*]]",
// CHECK-NEXT: "kind": "CXXRecordDecl",
// CHECK-NEXT: "loc": {
// CHECK-NEXT: "line": 10,
// CHECK-NEXT: "col": 8,
// CHECK-NEXT: "tokLen": 1
// CHECK-NEXT: },
// CHECK-NEXT: "range": {
// CHECK-NEXT: "begin": {
// CHECK-NEXT: "col": 1,
// CHECK-NEXT: "tokLen": 6
// CHECK-NEXT: },
// CHECK-NEXT: "end": {
// CHECK-NEXT: "line": 12,
// CHECK-NEXT: "col": 1,
// CHECK-NEXT: "tokLen": 1
// CHECK-NEXT: }
// CHECK-NEXT: },
// CHECK-NEXT: "name": "S",
// CHECK-NEXT: "tagUsed": "struct",
// CHECK-NEXT: "completeDefinition": true,
// CHECK-NEXT: "definitionData": {
// CHECK-NEXT: "canConstDefaultInit": true,
// CHECK-NEXT: "canPassInRegisters": true,
// CHECK-NEXT: "copyAssign": {
// CHECK-NEXT: "hasConstParam": true,
// CHECK-NEXT: "implicitHasConstParam": true,
// CHECK-NEXT: "needsImplicit": true,
// CHECK-NEXT: "trivial": true
// CHECK-NEXT: },
// CHECK-NEXT: "copyCtor": {
// CHECK-NEXT: "hasConstParam": true,
// CHECK-NEXT: "implicitHasConstParam": true,
// CHECK-NEXT: "needsImplicit": true,
// CHECK-NEXT: "simple": true,
// CHECK-NEXT: "trivial": true
// CHECK-NEXT: },
// CHECK-NEXT: "defaultCtor": {
// CHECK-NEXT: "defaultedIsConstexpr": true,
// CHECK-NEXT: "exists": true,
// CHECK-NEXT: "isConstexpr": true,
// CHECK-NEXT: "needsImplicit": true,
// CHECK-NEXT: "trivial": true
// CHECK-NEXT: },
// CHECK-NEXT: "dtor": {
// CHECK-NEXT: "irrelevant": true,
// CHECK-NEXT: "needsImplicit": true,
// CHECK-NEXT: "simple": true,
// CHECK-NEXT: "trivial": true
// CHECK-NEXT: },
// CHECK-NEXT: "hasConstexprNonCopyMoveConstructor": true,
// CHECK-NEXT: "isAggregate": true,
// CHECK-NEXT: "isEmpty": true,
// CHECK-NEXT: "isLiteral": true,
// CHECK-NEXT: "isPOD": true,
// CHECK-NEXT: "isStandardLayout": true,
// CHECK-NEXT: "isTrivial": true,
// CHECK-NEXT: "isTriviallyCopyable": true,
// CHECK-NEXT: "moveAssign": {
// CHECK-NEXT: "exists": true,
// CHECK-NEXT: "needsImplicit": true,
// CHECK-NEXT: "simple": true,
// CHECK-NEXT: "trivial": true
// CHECK-NEXT: },
// CHECK-NEXT: "moveCtor": {
// CHECK-NEXT: "exists": true,
// CHECK-NEXT: "needsImplicit": true,
// CHECK-NEXT: "simple": true,
// CHECK-NEXT: "trivial": true
// CHECK-NEXT: }
// CHECK-NEXT: },
// CHECK-NEXT: "inner": [
// CHECK-NEXT: {
// CHECK-NEXT: "id": "0x{{.*}}",
// CHECK-NEXT: "kind": "CXXRecordDecl",
// CHECK-NEXT: "loc": {
// CHECK-NEXT: "line": 10,
// CHECK-NEXT: "col": 8,
// CHECK-NEXT: "tokLen": 1
// CHECK-NEXT: },
// CHECK-NEXT: "range": {
// CHECK-NEXT: "begin": {
// CHECK-NEXT: "col": 1,
// CHECK-NEXT: "tokLen": 6
// CHECK-NEXT: },
// CHECK-NEXT: "end": {
// CHECK-NEXT: "col": 8,
// CHECK-NEXT: "tokLen": 1
// CHECK-NEXT: }
// CHECK-NEXT: },
// CHECK-NEXT: "isImplicit": true,
// CHECK-NEXT: "name": "S",
// CHECK-NEXT: "tagUsed": "struct"
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "id": "0x[[METHOD_ID:.*]]",
// CHECK-NEXT: "kind": "CXXMethodDecl",
// CHECK-NEXT: "loc": {
// CHECK-NEXT: "line": 11,
// CHECK-NEXT: "col": 8,
// CHECK-NEXT: "tokLen": 6
// CHECK-NEXT: },
// CHECK-NEXT: "range": {
// CHECK-NEXT: "begin": {
// CHECK-NEXT: "col": 3,
// CHECK-NEXT: "tokLen": 4
// CHECK-NEXT: },
// CHECK-NEXT: "end": {
// CHECK-NEXT: "col": 15,
// CHECK-NEXT: "tokLen": 1
// CHECK-NEXT: }
// CHECK-NEXT: },
// CHECK-NEXT: "name": "Method",
// CHECK-NEXT: "type": {
// CHECK-NEXT: "qualType": "void ()"
// CHECK-NEXT: }
// CHECK-NEXT: }
// CHECK-NEXT: ]
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "id": "0x{{.*}}",
// CHECK-NEXT: "kind": "CXXMethodDecl",
// CHECK-NEXT: "loc": {
// CHECK-NEXT: "line": 13,
// CHECK-NEXT: "col": 9,
// CHECK-NEXT: "tokLen": 6
// CHECK-NEXT: },
// CHECK-NEXT: "range": {
// CHECK-NEXT: "begin": {
// CHECK-NEXT: "col": 1,
// CHECK-NEXT: "tokLen": 4
// CHECK-NEXT: },
// CHECK-NEXT: "end": {
// CHECK-NEXT: "col": 19,
// CHECK-NEXT: "tokLen": 1
// CHECK-NEXT: }
// CHECK-NEXT: },
// CHECK-NEXT: "parentDeclContextId": "0x[[S_ID]]",
// CHECK-NEXT: "previousDecl": "0x[[METHOD_ID]]",
// CHECK-NEXT: "name": "Method",
// CHECK-NEXT: "type": {
// CHECK-NEXT: "qualType": "void ()"
// CHECK-NEXT: },
// CHECK-NEXT: "inner": [
// CHECK-NEXT: {
// CHECK-NEXT: "id": "0x{{.*}}",
// CHECK-NEXT: "kind": "CompoundStmt",
// CHECK-NEXT: "range": {
// CHECK-NEXT: "begin": {
// CHECK-NEXT: "col": 18,
// CHECK-NEXT: "tokLen": 1
// CHECK-NEXT: },
// CHECK-NEXT: "end": {
// CHECK-NEXT: "col": 19,
// CHECK-NEXT: "tokLen": 1
// CHECK-NEXT: }
// CHECK-NEXT: }
// CHECK-NEXT: }
// CHECK-NEXT: ]
// CHECK-NEXT: }
// CHECK-NEXT: ]
// CHECK-NEXT: }

clang/test/AST/ast-dump-decl-json.c

Show First 20 Lines • Show All 220 Lines • ▼ Show 20 Lines
// CHECK-NEXT: "tokLen": 6 // CHECK-NEXT: "tokLen": 6
// CHECK-NEXT: }, // CHECK-NEXT: },
// CHECK-NEXT: "end": { // CHECK-NEXT: "end": {
// CHECK-NEXT: "line": 13, // CHECK-NEXT: "line": 13,
// CHECK-NEXT: "col": 3, // CHECK-NEXT: "col": 3,
// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: "tokLen": 1
// CHECK-NEXT: } // CHECK-NEXT: }
// CHECK-NEXT: }, // CHECK-NEXT: },
// CHECK-NEXT: "parentDeclContext": "0x{{.*}}", // CHECK-NEXT: "parentDeclContextId": "0x{{.*}}",
// CHECK-NEXT: "name": "y", // CHECK-NEXT: "name": "y",
// CHECK-NEXT: "tagUsed": "struct", // CHECK-NEXT: "tagUsed": "struct",
// CHECK-NEXT: "completeDefinition": true, // CHECK-NEXT: "completeDefinition": true,
// CHECK-NEXT: "inner": [ // CHECK-NEXT: "inner": [
// CHECK-NEXT: { // CHECK-NEXT: {
// CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "id": "0x{{.*}}",
// CHECK-NEXT: "kind": "FieldDecl", // CHECK-NEXT: "kind": "FieldDecl",
// CHECK-NEXT: "loc": { // CHECK-NEXT: "loc": {
▲ Show 20 Lines • Show All 1,352 Lines • Show Last 20 Lines

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

Show First 20 Lines • Show All 420 Lines • ▼ Show 20 Lines
// CHECK-NEXT: "col": 1, // CHECK-NEXT: "col": 1,
// CHECK-NEXT: "tokLen": 4 // CHECK-NEXT: "tokLen": 4
// CHECK-NEXT: }, // CHECK-NEXT: },
// CHECK-NEXT: "end": { // CHECK-NEXT: "end": {
// CHECK-NEXT: "col": 18, // CHECK-NEXT: "col": 18,
// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: "tokLen": 1
// CHECK-NEXT: } // CHECK-NEXT: }
// CHECK-NEXT: }, // CHECK-NEXT: },
// CHECK-NEXT: "parentDeclContext": "0x{{.*}}", // CHECK-NEXT: "parentDeclContextId": "0x{{.*}}",
// CHECK-NEXT: "previousDecl": "0x{{.*}}", // CHECK-NEXT: "previousDecl": "0x{{.*}}",
// CHECK-NEXT: "name": "Test1", // CHECK-NEXT: "name": "Test1",
// CHECK-NEXT: "type": { // CHECK-NEXT: "type": {
// CHECK-NEXT: "qualType": "void ()" // CHECK-NEXT: "qualType": "void ()"
// CHECK-NEXT: }, // CHECK-NEXT: },
// CHECK-NEXT: "inner": [ // CHECK-NEXT: "inner": [
// CHECK-NEXT: { // CHECK-NEXT: {
// CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "id": "0x{{.*}}",
▲ Show 20 Lines • Show All 615 Lines • Show Last 20 Lines

clang/test/AST/ast-dump-template-decls-json.cpp

Show First 20 Lines • Show All 2,211 Lines • ▼ Show 20 Lines
// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: "tokLen": 8
// CHECK-NEXT: }, // CHECK-NEXT: },
// CHECK-NEXT: "end": { // CHECK-NEXT: "end": {
// CHECK-NEXT: "line": 56, // CHECK-NEXT: "line": 56,
// CHECK-NEXT: "col": 18, // CHECK-NEXT: "col": 18,
// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: "tokLen": 1
// CHECK-NEXT: } // CHECK-NEXT: }
// CHECK-NEXT: }, // CHECK-NEXT: },
// CHECK-NEXT: "parentDeclContext": "0x{{.*}}", // CHECK-NEXT: "parentDeclContextId": "0x{{.*}}",
// CHECK-NEXT: "previousDecl": "0x{{.*}}", // CHECK-NEXT: "previousDecl": "0x{{.*}}",
// CHECK-NEXT: "name": "f", // CHECK-NEXT: "name": "f",
// CHECK-NEXT: "inner": [ // CHECK-NEXT: "inner": [
// CHECK-NEXT: { // CHECK-NEXT: {
// CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "id": "0x{{.*}}",
// CHECK-NEXT: "kind": "TemplateTypeParmDecl", // CHECK-NEXT: "kind": "TemplateTypeParmDecl",
// CHECK-NEXT: "loc": { // CHECK-NEXT: "loc": {
// CHECK-NEXT: "line": 55, // CHECK-NEXT: "line": 55,
Show All 30 Lines
// CHECK-NEXT: "tokLen": 8 // CHECK-NEXT: "tokLen": 8
// CHECK-NEXT: }, // CHECK-NEXT: },
// CHECK-NEXT: "end": { // CHECK-NEXT: "end": {
// CHECK-NEXT: "line": 56, // CHECK-NEXT: "line": 56,
// CHECK-NEXT: "col": 18, // CHECK-NEXT: "col": 18,
// CHECK-NEXT: "tokLen": 1 // CHECK-NEXT: "tokLen": 1
// CHECK-NEXT: } // CHECK-NEXT: }
// CHECK-NEXT: }, // CHECK-NEXT: },
// CHECK-NEXT: "parentDeclContext": "0x{{.*}}", // CHECK-NEXT: "parentDeclContextId": "0x{{.*}}",
// CHECK-NEXT: "previousDecl": "0x{{.*}}", // CHECK-NEXT: "previousDecl": "0x{{.*}}",
// CHECK-NEXT: "name": "f", // CHECK-NEXT: "name": "f",
// CHECK-NEXT: "type": { // CHECK-NEXT: "type": {
// CHECK-NEXT: "qualType": "void ()" // CHECK-NEXT: "qualType": "void ()"
// CHECK-NEXT: }, // CHECK-NEXT: },
// CHECK-NEXT: "inner": [ // CHECK-NEXT: "inner": [
// CHECK-NEXT: { // CHECK-NEXT: {
// CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "id": "0x{{.*}}",
Show All 18 Lines