Skip to content

Commit 3ac33bf

Browse files
ilovepiPeterChou1
andcommitted
[clang-doc] Update serializer for improved template handling
This patch updates Serialize.cpp to serialize more data about C++ templates, which are supported by the new mustache HTML template. Split from #133161. Co-authored-by: Peter Chou <[email protected]>
1 parent 5ab017a commit 3ac33bf

File tree

2 files changed

+204
-8
lines changed

2 files changed

+204
-8
lines changed

clang-tools-extra/clang-doc/Representation.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,9 @@ struct FunctionInfo : public SymbolInfo {
363363
// specializations.
364364
SmallString<16> FullName;
365365

366+
// Function Prototype
367+
SmallString<256> Prototype;
368+
366369
// When present, this function is a template or specialization.
367370
std::optional<TemplateInfo> Template;
368371
};

clang-tools-extra/clang-doc/Serialize.cpp

Lines changed: 201 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88

99
#include "Serialize.h"
1010
#include "BitcodeWriter.h"
11+
#include "clang/AST/Attr.h"
1112
#include "clang/AST/Comment.h"
1213
#include "clang/Index/USRGeneration.h"
1314
#include "clang/Lex/Lexer.h"
14-
#include "llvm/ADT/Hashing.h"
1515
#include "llvm/ADT/StringExtras.h"
1616
#include "llvm/Support/SHA1.h"
1717

@@ -35,6 +35,175 @@ static void populateMemberTypeInfo(RecordInfo &I, AccessSpecifier &Access,
3535
const DeclaratorDecl *D,
3636
bool IsStatic = false);
3737

38+
static void getTemplateParameters(const TemplateParameterList *TemplateParams,
39+
llvm::raw_ostream &Stream) {
40+
Stream << "template <";
41+
42+
for (unsigned i = 0; i < TemplateParams->size(); ++i) {
43+
if (i > 0)
44+
Stream << ", ";
45+
46+
const NamedDecl *Param = TemplateParams->getParam(i);
47+
if (const auto *TTP = llvm::dyn_cast<TemplateTypeParmDecl>(Param)) {
48+
if (TTP->wasDeclaredWithTypename())
49+
Stream << "typename";
50+
else
51+
Stream << "class";
52+
if (TTP->isParameterPack())
53+
Stream << "...";
54+
Stream << " " << TTP->getNameAsString();
55+
} else if (const auto *NTTP =
56+
llvm::dyn_cast<NonTypeTemplateParmDecl>(Param)) {
57+
NTTP->getType().print(Stream, NTTP->getASTContext().getPrintingPolicy());
58+
if (NTTP->isParameterPack())
59+
Stream << "...";
60+
Stream << " " << NTTP->getNameAsString();
61+
} else if (const auto *TTPD =
62+
llvm::dyn_cast<TemplateTemplateParmDecl>(Param)) {
63+
Stream << "template <";
64+
getTemplateParameters(TTPD->getTemplateParameters(), Stream);
65+
Stream << "> class " << TTPD->getNameAsString();
66+
}
67+
}
68+
69+
Stream << "> ";
70+
}
71+
72+
// Extract the full function prototype from a FunctionDecl including
73+
// Full Decl
74+
static llvm::SmallString<256>
75+
getFunctionPrototype(const FunctionDecl *FuncDecl) {
76+
llvm::SmallString<256> Result;
77+
llvm::raw_svector_ostream Stream(Result);
78+
const ASTContext &Ctx = FuncDecl->getASTContext();
79+
const auto *Method = llvm::dyn_cast<CXXMethodDecl>(FuncDecl);
80+
// If it's a templated function, handle the template parameters
81+
if (const auto *TmplDecl = FuncDecl->getDescribedTemplate())
82+
getTemplateParameters(TmplDecl->getTemplateParameters(), Stream);
83+
84+
// If it's a virtual method
85+
if (Method && Method->isVirtual())
86+
Stream << "virtual ";
87+
88+
// Print return type
89+
FuncDecl->getReturnType().print(Stream, Ctx.getPrintingPolicy());
90+
91+
// Print function name
92+
Stream << " " << FuncDecl->getNameAsString() << "(";
93+
94+
// Print parameter list with types, names, and default values
95+
for (unsigned I = 0; I < FuncDecl->getNumParams(); ++I) {
96+
if (I > 0)
97+
Stream << ", ";
98+
const ParmVarDecl *ParamDecl = FuncDecl->getParamDecl(I);
99+
QualType ParamType = ParamDecl->getType();
100+
ParamType.print(Stream, Ctx.getPrintingPolicy());
101+
102+
// Print parameter name if it has one
103+
if (!ParamDecl->getName().empty())
104+
Stream << " " << ParamDecl->getNameAsString();
105+
106+
// Print default argument if it exists
107+
if (ParamDecl->hasDefaultArg()) {
108+
const Expr *DefaultArg = ParamDecl->getDefaultArg();
109+
if (DefaultArg) {
110+
Stream << " = ";
111+
DefaultArg->printPretty(Stream, nullptr, Ctx.getPrintingPolicy());
112+
}
113+
}
114+
}
115+
116+
// If it is a variadic function, add '...'
117+
if (FuncDecl->isVariadic()) {
118+
if (FuncDecl->getNumParams() > 0)
119+
Stream << ", ";
120+
Stream << "...";
121+
}
122+
123+
Stream << ")";
124+
125+
// If it's a const method, add 'const' qualifier
126+
if (Method) {
127+
if(Method->isDeleted())
128+
Stream << " = delete";
129+
if (Method->size_overridden_methods())
130+
Stream << " override";
131+
if (Method->hasAttr<clang::FinalAttr>())
132+
Stream << " final";
133+
if (Method->isConst())
134+
Stream << " const";
135+
if (Method->isPureVirtual())
136+
Stream << " = 0";
137+
}
138+
139+
if (auto ExceptionSpecType = FuncDecl->getExceptionSpecType())
140+
Stream << " " << ExceptionSpecType;
141+
142+
return Result; // Convert SmallString to std::string for return
143+
}
144+
145+
static llvm::SmallString<16> getTypeAlias(const TypeAliasDecl *Alias) {
146+
llvm::SmallString<16> Result;
147+
llvm::raw_svector_ostream Stream(Result);
148+
const ASTContext &Ctx = Alias->getASTContext();
149+
if (const auto *TmplDecl = Alias->getDescribedTemplate())
150+
getTemplateParameters(TmplDecl->getTemplateParameters(), Stream);
151+
Stream << "using " << Alias->getNameAsString() << " = ";
152+
QualType Q = Alias->getUnderlyingType();
153+
Q.print(Stream, Ctx.getPrintingPolicy());
154+
155+
return Result;
156+
}
157+
158+
// extract full syntax for record declaration
159+
static llvm::SmallString<16> getRecordPrototype(const CXXRecordDecl *CXXRD) {
160+
llvm::SmallString<16> Result;
161+
LangOptions LangOpts;
162+
PrintingPolicy Policy(LangOpts);
163+
Policy.SuppressTagKeyword = false;
164+
Policy.FullyQualifiedName = true;
165+
Policy.IncludeNewlines = false;
166+
llvm::raw_svector_ostream OS(Result);
167+
if (const auto *TD = CXXRD->getDescribedClassTemplate()) {
168+
OS << "template <";
169+
bool FirstParam = true;
170+
for (const auto *Param : *TD->getTemplateParameters()) {
171+
if (!FirstParam)
172+
OS << ", ";
173+
Param->print(OS, Policy);
174+
FirstParam = false;
175+
}
176+
OS << ">\n";
177+
}
178+
179+
if (CXXRD->isStruct())
180+
OS << "struct ";
181+
else if (CXXRD->isClass())
182+
OS << "class ";
183+
else if (CXXRD->isUnion())
184+
OS << "union ";
185+
186+
OS << CXXRD->getNameAsString();
187+
188+
// We need to make sure we have a good enough declaration to check. In the
189+
// case where the class is a forward declaration, we'll fail assertions in
190+
// DeclCXX.
191+
if (CXXRD->isCompleteDefinition() && CXXRD->getNumBases() > 0) {
192+
OS << " : ";
193+
bool FirstBase = true;
194+
for (const auto &Base : CXXRD->bases()) {
195+
if (!FirstBase)
196+
OS << ", ";
197+
if (Base.isVirtual())
198+
OS << "virtual ";
199+
OS << getAccessSpelling(Base.getAccessSpecifier()) << " ";
200+
OS << Base.getType().getAsString(Policy);
201+
FirstBase = false;
202+
}
203+
}
204+
return Result;
205+
}
206+
38207
// A function to extract the appropriate relative path for a given info's
39208
// documentation. The path returned is a composite of the parent namespaces.
40209
//
@@ -408,7 +577,6 @@ static void parseEnumerators(EnumInfo &I, const EnumDecl *D) {
408577
ASTContext &Context = E->getASTContext();
409578
if (RawComment *Comment =
410579
E->getASTContext().getRawCommentForDeclNoCache(E)) {
411-
CommentInfo CInfo;
412580
Comment->setAttached();
413581
if (comments::FullComment *Fc = Comment->parse(Context, nullptr, E)) {
414582
EnumValueInfo &Member = I.Members.back();
@@ -434,6 +602,7 @@ static void parseBases(RecordInfo &I, const CXXRecordDecl *D) {
434602
// Don't parse bases if this isn't a definition.
435603
if (!D->isThisDeclarationADefinition())
436604
return;
605+
437606
for (const CXXBaseSpecifier &B : D->bases()) {
438607
if (B.isVirtual())
439608
continue;
@@ -555,6 +724,7 @@ static void populateFunctionInfo(FunctionInfo &I, const FunctionDecl *D,
555724
populateSymbolInfo(I, D, FC, Loc, IsInAnonymousNamespace);
556725
auto &LO = D->getLangOpts();
557726
I.ReturnType = getTypeInfoForType(D->getReturnType(), LO);
727+
I.Prototype = getFunctionPrototype(D);
558728
parseParameters(I, D);
559729

560730
populateTemplateParameters(I.Template, D);
@@ -686,15 +856,19 @@ emitInfo(const NamespaceDecl *D, const FullComment *FC, Location Loc,
686856
std::pair<std::unique_ptr<Info>, std::unique_ptr<Info>>
687857
emitInfo(const RecordDecl *D, const FullComment *FC, Location Loc,
688858
bool PublicOnly) {
859+
689860
auto RI = std::make_unique<RecordInfo>();
690861
bool IsInAnonymousNamespace = false;
862+
691863
populateSymbolInfo(*RI, D, FC, Loc, IsInAnonymousNamespace);
692864
if (!shouldSerializeInfo(PublicOnly, IsInAnonymousNamespace, D))
693865
return {};
694866

695867
RI->TagType = D->getTagKind();
696868
parseFields(*RI, D, PublicOnly);
869+
697870
if (const auto *C = dyn_cast<CXXRecordDecl>(D)) {
871+
RI->FullName = getRecordPrototype(C);
698872
if (const TypedefNameDecl *TD = C->getTypedefNameForAnonDecl()) {
699873
RI->Name = TD->getNameAsString();
700874
RI->IsTypeDef = true;
@@ -716,11 +890,11 @@ emitInfo(const RecordDecl *D, const FullComment *FC, Location Loc,
716890

717891
// What this is a specialization of.
718892
auto SpecOf = CTSD->getSpecializedTemplateOrPartial();
719-
if (auto *CTD = dyn_cast<ClassTemplateDecl *>(SpecOf))
720-
Specialization.SpecializationOf = getUSRForDecl(CTD);
721-
else if (auto *CTPSD =
893+
if (auto *SpecTD = dyn_cast<ClassTemplateDecl *>(SpecOf))
894+
Specialization.SpecializationOf = getUSRForDecl(SpecTD);
895+
else if (auto *SpecTD =
722896
dyn_cast<ClassTemplatePartialSpecializationDecl *>(SpecOf))
723-
Specialization.SpecializationOf = getUSRForDecl(CTPSD);
897+
Specialization.SpecializationOf = getUSRForDecl(SpecTD);
724898

725899
// Parameters to the specialization. For partial specializations, get the
726900
// parameters "as written" from the ClassTemplatePartialSpecializationDecl
@@ -792,25 +966,42 @@ emitInfo(const CXXMethodDecl *D, const FullComment *FC, Location Loc,
792966
return {nullptr, makeAndInsertIntoParent<FunctionInfo &&>(std::move(Func))};
793967
}
794968

969+
static void extractCommentFromDecl(const Decl *D, TypedefInfo &Info) {
970+
assert(D && "Invalid Decl when extracting comment");
971+
ASTContext &Context = D->getASTContext();
972+
RawComment *Comment = Context.getRawCommentForDeclNoCache(D);
973+
if (!Comment)
974+
return;
975+
976+
Comment->setAttached();
977+
if (comments::FullComment *Fc = Comment->parse(Context, nullptr, D)) {
978+
Info.Description.emplace_back();
979+
parseFullComment(Fc, Info.Description.back());
980+
}
981+
}
982+
795983
std::pair<std::unique_ptr<Info>, std::unique_ptr<Info>>
796984
emitInfo(const TypedefDecl *D, const FullComment *FC, Location Loc,
797985
bool PublicOnly) {
798986
TypedefInfo Info;
799987
bool IsInAnonymousNamespace = false;
800988
populateInfo(Info, D, FC, IsInAnonymousNamespace);
989+
801990
if (!shouldSerializeInfo(PublicOnly, IsInAnonymousNamespace, D))
802991
return {};
803992

804993
Info.DefLoc = Loc;
805994
auto &LO = D->getLangOpts();
806995
Info.Underlying = getTypeInfoForType(D->getUnderlyingType(), LO);
996+
807997
if (Info.Underlying.Type.Name.empty()) {
808998
// Typedef for an unnamed type. This is like "typedef struct { } Foo;"
809999
// The record serializer explicitly checks for this syntax and constructs
8101000
// a record with that name, so we don't want to emit a duplicate here.
8111001
return {};
8121002
}
8131003
Info.IsUsing = false;
1004+
extractCommentFromDecl(D, Info);
8141005

8151006
// Info is wrapped in its parent scope so is returned in the second position.
8161007
return {nullptr, makeAndInsertIntoParent<TypedefInfo &&>(std::move(Info))};
@@ -822,17 +1013,19 @@ std::pair<std::unique_ptr<Info>, std::unique_ptr<Info>>
8221013
emitInfo(const TypeAliasDecl *D, const FullComment *FC, Location Loc,
8231014
bool PublicOnly) {
8241015
TypedefInfo Info;
825-
8261016
bool IsInAnonymousNamespace = false;
8271017
populateInfo(Info, D, FC, IsInAnonymousNamespace);
8281018
if (!shouldSerializeInfo(PublicOnly, IsInAnonymousNamespace, D))
8291019
return {};
8301020

8311021
Info.DefLoc = Loc;
832-
auto &LO = D->getLangOpts();
1022+
const LangOptions &LO = D->getLangOpts();
8331023
Info.Underlying = getTypeInfoForType(D->getUnderlyingType(), LO);
1024+
Info.TypeDeclaration = getTypeAlias(D);
8341025
Info.IsUsing = true;
8351026

1027+
extractCommentFromDecl(D, Info);
1028+
8361029
// Info is wrapped in its parent scope so is returned in the second position.
8371030
return {nullptr, makeAndInsertIntoParent<TypedefInfo &&>(std::move(Info))};
8381031
}

0 commit comments

Comments
 (0)