This is an archive of the discontinued LLVM Phabricator instance.

Differential D146354

[clang][ExtractAPI] Add semicolons for enum, typedef, struct declaration fragments
ClosedPublic

Authored by chaitanyav on Mar 18 2023, 12:59 AM.

Details

Reviewers
dang
ributzka
Commits
rGafce10c5b60f: [clang][ExtractAPI] Add semicolons for enum, typedef, struct declaration…
Summary

Fixes https://github.com/llvm/llvm-project/issues/61480

Diff Detail

Unit TestsFailed

TimeTest
100 msx64 debian > Clang.ExtractAPI::underscored.c
260 msx64 debian > Flang.Driver::code-gen-rv64.f90

Event Timeline

chaitanyav created this revision.Mar 18 2023, 12:59 AM
Herald added a reviewer: ributzka. · View Herald TranscriptMar 18 2023, 12:59 AM
Herald added a project: Restricted Project. · View Herald Transcript
chaitanyav requested review of this revision.Mar 18 2023, 12:59 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 18 2023, 12:59 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B220205: Diff 506277.Mar 18 2023, 1:32 AM
chaitanyav added a child revision: D146363: Update reference output in underscored.c.Mar 18 2023, 10:55 AM
chaitanyav updated this revision to Diff 506308.Mar 18 2023, 11:09 AM
  • Update reference output in underscored.c
  • combine return and append semicolon fragment
Harbormaster completed remote builds in B220231: Diff 506308.Mar 18 2023, 11:09 AM
chaitanyav updated this revision to Diff 506309.Mar 18 2023, 11:13 AM
  • Update reference output in underscored.c
  • combine return and append semicolon fragment
Harbormaster completed remote builds in B220232: Diff 506309.Mar 18 2023, 11:49 AM
chaitanyav added a comment.Mar 19 2023, 9:29 PM

The debian build is failing because of this https://github.com/google/llvm-premerge-checks/issues/436

The windows build is failing because of https://github.com/llvm/llvm-project/issues/61519, i see that the fix (https://reviews.llvm.org/rGd233c7b814071e8b9345b1c25411272ec7446c8d) for this is already on main but i cannot trigger a new build for my changes.

Please advice on how to trigger a new build that will run on latest main.

dang accepted this revision.Mar 20 2023, 7:09 AM

LGTM! I think it's fine to go ahead and land this (premerge check are not a requirement). Have you contributed to LLVM before? If not I will need to commit it on your behalf. Once that is done you should follow the instructions at https://llvm.org/docs/DeveloperPolicy.html#obtaining-commit-access to gain commit access if you wish to continue contributing to the project and LLVM in general.

This revision is now accepted and ready to land.Mar 20 2023, 7:09 AM
chaitanyav added a comment.Mar 20 2023, 8:26 AM

Thank you, Please go ahead and Commit the change. I don't have commit access, Will follow the instructions on the page to get access.

chaitanyav added a comment.Mar 20 2023, 8:28 AM

Name: NagaChaitanya Vellanki
email: pnagato@protonmail.com

This revision was landed with ongoing or failed builds.Mar 20 2023, 8:43 AM
Closed by commit rGafce10c5b60f: [clang][ExtractAPI] Add semicolons for enum, typedef, struct declaration… (authored by chaitanyav, committed by dang). · Explain Why
This revision was automatically updated to reflect the committed changes.
dang added a commit: rGafce10c5b60f: [clang][ExtractAPI] Add semicolons for enum, typedef, struct declaration….

Revision Contents

PathSize
clang/
lib/
ExtractAPI/
4 lines
test/
ExtractAPI/
8 lines
16 lines
4 lines
4 lines
24 lines
12 lines

Diff 506277

clang/lib/ExtractAPI/DeclarationFragments.cpp

//===- ExtractAPI/DeclarationFragments.cpp ----------------------*- C++ -*-===// //===- ExtractAPI/DeclarationFragments.cpp ----------------------*- C++ -*-===//
Lint: Lint
Inline Actions

clang-format not found in user’s local PATH; not linting file.

Lint: Lint: clang-format not found in user’s local PATH; not linting file.
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
/// ///
▲ Show 20 Lines • Show All 456 Lines • ▼ Show 20 LinesDeclarationFragmentsBuilder::getFragmentsForEnum(const EnumDecl *EnumDecl) {
QualType IntegerType = EnumDecl->getIntegerType(); QualType IntegerType = EnumDecl->getIntegerType();
if (!IntegerType.isNull()) if (!IntegerType.isNull())
Fragments.append(": ", DeclarationFragments::FragmentKind::Text) Fragments.append(": ", DeclarationFragments::FragmentKind::Text)
.append( .append(
getFragmentsForType(IntegerType, EnumDecl->getASTContext(), After)) getFragmentsForType(IntegerType, EnumDecl->getASTContext(), After))
.append(std::move(After)); .append(std::move(After));
Fragments.append(";", DeclarationFragments::FragmentKind::Text);
return Fragments; return Fragments;
} }
DeclarationFragments DeclarationFragments
DeclarationFragmentsBuilder::getFragmentsForField(const FieldDecl *Field) { DeclarationFragmentsBuilder::getFragmentsForField(const FieldDecl *Field) {
DeclarationFragments After; DeclarationFragments After;
return getFragmentsForType(Field->getType(), Field->getASTContext(), After) return getFragmentsForType(Field->getType(), Field->getASTContext(), After)
.appendSpace() .appendSpace()
.append(Field->getName(), DeclarationFragments::FragmentKind::Identifier) .append(Field->getName(), DeclarationFragments::FragmentKind::Identifier)
.append(std::move(After)); .append(std::move(After));
} }
DeclarationFragments DeclarationFragments
DeclarationFragmentsBuilder::getFragmentsForStruct(const RecordDecl *Record) { DeclarationFragmentsBuilder::getFragmentsForStruct(const RecordDecl *Record) {
if (const auto *TypedefNameDecl = Record->getTypedefNameForAnonDecl()) if (const auto *TypedefNameDecl = Record->getTypedefNameForAnonDecl())
return getFragmentsForTypedef(TypedefNameDecl); return getFragmentsForTypedef(TypedefNameDecl);
DeclarationFragments Fragments; DeclarationFragments Fragments;
Fragments.append("struct", DeclarationFragments::FragmentKind::Keyword); Fragments.append("struct", DeclarationFragments::FragmentKind::Keyword);
if (!Record->getName().empty()) if (!Record->getName().empty())
Fragments.appendSpace().append( Fragments.appendSpace().append(
Record->getName(), DeclarationFragments::FragmentKind::Identifier); Record->getName(), DeclarationFragments::FragmentKind::Identifier);
Fragments.append(";", DeclarationFragments::FragmentKind::Text);
return Fragments; return Fragments;
} }
DeclarationFragments DeclarationFragments
DeclarationFragmentsBuilder::getFragmentsForMacro(StringRef Name, DeclarationFragmentsBuilder::getFragmentsForMacro(StringRef Name,
const MacroDirective *MD) { const MacroDirective *MD) {
DeclarationFragments Fragments; DeclarationFragments Fragments;
Fragments.append("#define", DeclarationFragments::FragmentKind::Keyword) Fragments.append("#define", DeclarationFragments::FragmentKind::Keyword)
▲ Show 20 Lines • Show All 234 Lines • ▼ Show 20 LinesDeclarationFragments DeclarationFragmentsBuilder::getFragmentsForTypedef(
Fragments.append("typedef", DeclarationFragments::FragmentKind::Keyword) Fragments.append("typedef", DeclarationFragments::FragmentKind::Keyword)
.appendSpace() .appendSpace()
.append(getFragmentsForType(Decl->getUnderlyingType(), .append(getFragmentsForType(Decl->getUnderlyingType(),
Decl->getASTContext(), After)) Decl->getASTContext(), After))
.append(std::move(After)) .append(std::move(After))
.appendSpace() .appendSpace()
.append(Decl->getName(), DeclarationFragments::FragmentKind::Identifier); .append(Decl->getName(), DeclarationFragments::FragmentKind::Identifier);
Fragments.append(";", DeclarationFragments::FragmentKind::Text);
return Fragments; return Fragments;
} }
template <typename FunctionT> template <typename FunctionT>
FunctionSignature FunctionSignature
DeclarationFragmentsBuilder::getFunctionSignature(const FunctionT *Function) { DeclarationFragmentsBuilder::getFunctionSignature(const FunctionT *Function) {
FunctionSignature Signature; FunctionSignature Signature;
▲ Show 20 Lines • Show All 52 Lines • Show Last 20 Lines

clang/test/ExtractAPI/anonymous_record_no_typedef.c

Show First 20 Lines • Show All 88 Lines • ▼ Show 20 Lines "symbols": [
{ {
"kind": "text", "kind": "text",
"spelling": ": " "spelling": ": "
}, },
{ {
"kind": "typeIdentifier", "kind": "typeIdentifier",
"preciseIdentifier": "c:i", "preciseIdentifier": "c:i",
"spelling": "unsigned int" "spelling": "unsigned int"
},
{
"kind": "text",
"spelling": ";"
} }
], ],
"docComment": { "docComment": {
"lines": [ "lines": [
{ {
"range": { "range": {
"end": { "end": {
"character": 29, "character": 29,
▲ Show 20 Lines • Show All 131 Lines • ▼ Show 20 Lines "symbols": [
}, },
{ {
"kind": "text", "kind": "text",
"spelling": " " "spelling": " "
}, },
{ {
"kind": "identifier", "kind": "identifier",
"spelling": "Vehicle" "spelling": "Vehicle"
},
{
"kind": "text",
"spelling": ";"
} }
], ],
"docComment": { "docComment": {
"lines": [ "lines": [
{ {
"range": { "range": {
"end": { "end": {
"character": 14, "character": 14,
▲ Show 20 Lines • Show All 149 Lines • Show Last 20 Lines

clang/test/ExtractAPI/enum.c

Show First 20 Lines • Show All 147 Lines • ▼ Show 20 Lines "symbols": [
{ {
"kind": "text", "kind": "text",
"spelling": ": " "spelling": ": "
}, },
{ {
"kind": "typeIdentifier", "kind": "typeIdentifier",
"preciseIdentifier": "c:i", "preciseIdentifier": "c:i",
"spelling": "unsigned int" "spelling": "unsigned int"
},
{
"kind": "text",
"spelling": ";"
} }
], ],
"docComment": { "docComment": {
"lines": [ "lines": [
{ {
"range": { "range": {
"end": { "end": {
"character": 22, "character": 22,
▲ Show 20 Lines • Show All 292 Lines • ▼ Show 20 Lines "symbols": [
{ {
"kind": "text", "kind": "text",
"spelling": ": " "spelling": ": "
}, },
{ {
"kind": "typeIdentifier", "kind": "typeIdentifier",
"preciseIdentifier": "c:c", "preciseIdentifier": "c:c",
"spelling": "unsigned char" "spelling": "unsigned char"
},
{
"kind": "text",
"spelling": ";"
} }
], ],
"identifier": { "identifier": {
"interfaceLanguage": "c", "interfaceLanguage": "c",
"precise": "c:@E@Direction" "precise": "c:@E@Direction"
}, },
"kind": { "kind": {
"displayName": "Enumeration", "displayName": "Enumeration",
▲ Show 20 Lines • Show All 207 Lines • ▼ Show 20 Lines "symbols": [
{ {
"kind": "text", "kind": "text",
"spelling": ": " "spelling": ": "
}, },
{ {
"kind": "typeIdentifier", "kind": "typeIdentifier",
"preciseIdentifier": "c:i", "preciseIdentifier": "c:i",
"spelling": "unsigned int" "spelling": "unsigned int"
},
{
"kind": "text",
"spelling": ";"
} }
], ],
"identifier": { "identifier": {
"interfaceLanguage": "c", "interfaceLanguage": "c",
"precise": "c:@Ea@Constant" "precise": "c:@Ea@Constant"
}, },
"kind": { "kind": {
"displayName": "Enumeration", "displayName": "Enumeration",
▲ Show 20 Lines • Show All 72 Lines • ▼ Show 20 Lines "symbols": [
{ {
"kind": "text", "kind": "text",
"spelling": ": " "spelling": ": "
}, },
{ {
"kind": "typeIdentifier", "kind": "typeIdentifier",
"preciseIdentifier": "c:i", "preciseIdentifier": "c:i",
"spelling": "unsigned int" "spelling": "unsigned int"
},
{
"kind": "text",
"spelling": ";"
} }
], ],
"identifier": { "identifier": {
"interfaceLanguage": "c", "interfaceLanguage": "c",
"precise": "c:@Ea@OtherConstant" "precise": "c:@Ea@OtherConstant"
}, },
"kind": { "kind": {
"displayName": "Enumeration", "displayName": "Enumeration",
▲ Show 20 Lines • Show All 67 Lines • Show Last 20 Lines

clang/test/ExtractAPI/struct.c

Show First 20 Lines • Show All 83 Lines • ▼ Show 20 Lines "symbols": [
}, },
{ {
"kind": "text", "kind": "text",
"spelling": " " "spelling": " "
}, },
{ {
"kind": "identifier", "kind": "identifier",
"spelling": "Color" "spelling": "Color"
},
{
"kind": "text",
"spelling": ";"
} }
], ],
"docComment": { "docComment": {
"lines": [ "lines": [
{ {
"range": { "range": {
"end": { "end": {
"character": 18, "character": 18,
▲ Show 20 Lines • Show All 272 Lines • Show Last 20 Lines

clang/test/ExtractAPI/typedef.c

Show First 20 Lines • Show All 60 Lines • ▼ Show 20 Lines "symbols": [
}, },
{ {
"kind": "text", "kind": "text",
"spelling": " " "spelling": " "
}, },
{ {
"kind": "identifier", "kind": "identifier",
"spelling": "MyInt" "spelling": "MyInt"
},
{
"kind": "text",
"spelling": ";"
} }
], ],
"identifier": { "identifier": {
"interfaceLanguage": "objective-c", "interfaceLanguage": "objective-c",
"precise": "c:input.h@T@MyInt" "precise": "c:input.h@T@MyInt"
}, },
"kind": { "kind": {
"displayName": "Type Alias", "displayName": "Type Alias",
Show All 31 Lines

clang/test/ExtractAPI/typedef_anonymous_record.c

Show First 20 Lines • Show All 69 Lines • ▼ Show 20 Lines "symbols": [
}, },
{ {
"kind": "text", "kind": "text",
"spelling": " " "spelling": " "
}, },
{ {
"kind": "identifier", "kind": "identifier",
"spelling": "MyEnum" "spelling": "MyEnum"
},
{
"kind": "text",
"spelling": ";"
} }
], ],
"identifier": { "identifier": {
"interfaceLanguage": "c", "interfaceLanguage": "c",
"precise": "c:@EA@MyEnum" "precise": "c:@EA@MyEnum"
}, },
"kind": { "kind": {
"displayName": "Enumeration", "displayName": "Enumeration",
▲ Show 20 Lines • Show All 79 Lines • ▼ Show 20 Lines "symbols": [
}, },
{ {
"kind": "text", "kind": "text",
"spelling": " " "spelling": " "
}, },
{ {
"kind": "identifier", "kind": "identifier",
"spelling": "MyStruct" "spelling": "MyStruct"
},
{
"kind": "text",
"spelling": ";"
} }
], ],
"identifier": { "identifier": {
"interfaceLanguage": "c", "interfaceLanguage": "c",
"precise": "c:@SA@MyStruct" "precise": "c:@SA@MyStruct"
}, },
"kind": { "kind": {
"displayName": "Structure", "displayName": "Structure",
Show All 37 Lines "symbols": [
}, },
{ {
"kind": "text", "kind": "text",
"spelling": " " "spelling": " "
}, },
{ {
"kind": "identifier", "kind": "identifier",
"spelling": "MyStructStruct" "spelling": "MyStructStruct"
},
{
"kind": "text",
"spelling": ";"
} }
], ],
"identifier": { "identifier": {
"interfaceLanguage": "c", "interfaceLanguage": "c",
"precise": "c:input.h@T@MyStructStruct" "precise": "c:input.h@T@MyStructStruct"
}, },
"kind": { "kind": {
"displayName": "Type Alias", "displayName": "Type Alias",
▲ Show 20 Lines • Show All 44 Lines • ▼ Show 20 Lines "symbols": [
}, },
{ {
"kind": "text", "kind": "text",
"spelling": " " "spelling": " "
}, },
{ {
"kind": "identifier", "kind": "identifier",
"spelling": "MyStructStructStruct" "spelling": "MyStructStructStruct"
},
{
"kind": "text",
"spelling": ";"
} }
], ],
"identifier": { "identifier": {
"interfaceLanguage": "c", "interfaceLanguage": "c",
"precise": "c:input.h@T@MyStructStructStruct" "precise": "c:input.h@T@MyStructStructStruct"
}, },
"kind": { "kind": {
"displayName": "Type Alias", "displayName": "Type Alias",
▲ Show 20 Lines • Show All 44 Lines • ▼ Show 20 Lines "symbols": [
}, },
{ {
"kind": "text", "kind": "text",
"spelling": " " "spelling": " "
}, },
{ {
"kind": "identifier", "kind": "identifier",
"spelling": "MyEnumEnum" "spelling": "MyEnumEnum"
},
{
"kind": "text",
"spelling": ";"
} }
], ],
"identifier": { "identifier": {
"interfaceLanguage": "c", "interfaceLanguage": "c",
"precise": "c:input.h@T@MyEnumEnum" "precise": "c:input.h@T@MyEnumEnum"
}, },
"kind": { "kind": {
"displayName": "Type Alias", "displayName": "Type Alias",
▲ Show 20 Lines • Show All 44 Lines • ▼ Show 20 Lines "symbols": [
}, },
{ {
"kind": "text", "kind": "text",
"spelling": " " "spelling": " "
}, },
{ {
"kind": "identifier", "kind": "identifier",
"spelling": "MyEnumEnumEnum" "spelling": "MyEnumEnumEnum"
},
{
"kind": "text",
"spelling": ";"
} }
], ],
"identifier": { "identifier": {
"interfaceLanguage": "c", "interfaceLanguage": "c",
"precise": "c:input.h@T@MyEnumEnumEnum" "precise": "c:input.h@T@MyEnumEnumEnum"
}, },
"kind": { "kind": {
"displayName": "Type Alias", "displayName": "Type Alias",
Show All 31 Lines

clang/test/ExtractAPI/typedef_chain.c

Show First 20 Lines • Show All 62 Lines • ▼ Show 20 Lines "symbols": [
}, },
{ {
"kind": "text", "kind": "text",
"spelling": " " "spelling": " "
}, },
{ {
"kind": "identifier", "kind": "identifier",
"spelling": "MyInt" "spelling": "MyInt"
},
{
"kind": "text",
"spelling": ";"
} }
], ],
"identifier": { "identifier": {
"interfaceLanguage": "objective-c", "interfaceLanguage": "objective-c",
"precise": "c:input.h@T@MyInt" "precise": "c:input.h@T@MyInt"
}, },
"kind": { "kind": {
"displayName": "Type Alias", "displayName": "Type Alias",
▲ Show 20 Lines • Show All 44 Lines • ▼ Show 20 Lines "symbols": [
}, },
{ {
"kind": "text", "kind": "text",
"spelling": " " "spelling": " "
}, },
{ {
"kind": "identifier", "kind": "identifier",
"spelling": "MyIntInt" "spelling": "MyIntInt"
},
{
"kind": "text",
"spelling": ";"
} }
], ],
"identifier": { "identifier": {
"interfaceLanguage": "objective-c", "interfaceLanguage": "objective-c",
"precise": "c:input.h@T@MyIntInt" "precise": "c:input.h@T@MyIntInt"
}, },
"kind": { "kind": {
"displayName": "Type Alias", "displayName": "Type Alias",
▲ Show 20 Lines • Show All 44 Lines • ▼ Show 20 Lines "symbols": [
}, },
{ {
"kind": "text", "kind": "text",
"spelling": " " "spelling": " "
}, },
{ {
"kind": "identifier", "kind": "identifier",
"spelling": "MyIntIntInt" "spelling": "MyIntIntInt"
},
{
"kind": "text",
"spelling": ";"
} }
], ],
"identifier": { "identifier": {
"interfaceLanguage": "objective-c", "interfaceLanguage": "objective-c",
"precise": "c:input.h@T@MyIntIntInt" "precise": "c:input.h@T@MyIntIntInt"
}, },
"kind": { "kind": {
"displayName": "Type Alias", "displayName": "Type Alias",
Show All 31 Lines