diff --git a/clang/lib/ExtractAPI/DeclarationFragments.cpp b/clang/lib/ExtractAPI/DeclarationFragments.cpp --- a/clang/lib/ExtractAPI/DeclarationFragments.cpp +++ b/clang/lib/ExtractAPI/DeclarationFragments.cpp @@ -470,8 +470,7 @@ getFragmentsForType(IntegerType, EnumDecl->getASTContext(), After)) .append(std::move(After)); - Fragments.append(";", DeclarationFragments::FragmentKind::Text); - return Fragments; + return Fragments.append(";", DeclarationFragments::FragmentKind::Text); } DeclarationFragments @@ -495,8 +494,7 @@ Fragments.appendSpace().append( Record->getName(), DeclarationFragments::FragmentKind::Identifier); - Fragments.append(";", DeclarationFragments::FragmentKind::Text); - return Fragments; + return Fragments.append(";", DeclarationFragments::FragmentKind::Text); } DeclarationFragments @@ -746,8 +744,7 @@ .appendSpace() .append(Decl->getName(), DeclarationFragments::FragmentKind::Identifier); - Fragments.append(";", DeclarationFragments::FragmentKind::Text); - return Fragments; + return Fragments.append(";", DeclarationFragments::FragmentKind::Text); } template diff --git a/clang/test/ExtractAPI/underscored.c b/clang/test/ExtractAPI/underscored.c --- a/clang/test/ExtractAPI/underscored.c +++ b/clang/test/ExtractAPI/underscored.c @@ -135,6 +135,10 @@ { "kind": "identifier", "spelling": "ExposedRecord" + }, + { + "kind": "text", + "spelling": ";" } ], "identifier": { @@ -296,6 +300,10 @@ { "kind": "identifier", "spelling": "ExposedTypedef" + }, + { + "kind": "text", + "spelling": ";" } ], "identifier": { @@ -356,6 +364,10 @@ { "kind": "identifier", "spelling": "ExposedTypedefToHidden" + }, + { + "kind": "text", + "spelling": ";" } ], "identifier": {