brettw created this revision.
brettw added a reviewer: paulkirth.
brettw added a project: clang-tools-extra.
Herald added a project: All.
brettw requested review of this revision.
Herald added a subscriber: cfe-commits.
Several different places in the code had similar computations for the
parameters that were eventually passed to the TypeInfo constructor.
This centralizes that code in one function, and allows passing TypeInfo to the
various other *Info structures that need it.
Remove some "auto" types and replace with the real type for getting
declarations. This was making some duplicate checking difficult to see.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D134225
Files:
clang-tools-extra/clang-doc/Representation.h
clang-tools-extra/clang-doc/Serialize.cpp
Index: clang-tools-extra/clang-doc/Serialize.cpp
===================================================================
--- clang-tools-extra/clang-doc/Serialize.cpp
+++ clang-tools-extra/clang-doc/Serialize.cpp
@@ -224,12 +224,34 @@
return hashUSR(USR);
}
-static RecordDecl *getDeclForType(const QualType &T) {
+static TagDecl *getTagDeclForType(const QualType &T) {
+ if (const TagDecl *D = T->getAsTagDecl())
+ return D->getDefinition();
+ return nullptr;
+}
+
+static RecordDecl *getRecordDeclForType(const QualType &T) {
if (const RecordDecl *D = T->getAsRecordDecl())
return D->getDefinition();
return nullptr;
}
+TypeInfo getTypeInfoForType(const QualType &T) {
+ if (const TagDecl *TD = getTagDeclForType(T)) {
+ InfoType IT;
+ if (dyn_cast<EnumDecl>(TD)) {
+ IT = InfoType::IT_enum;
+ } else if (dyn_cast<RecordDecl>(TD)) {
+ IT = InfoType::IT_record;
+ } else {
+ IT = InfoType::IT_default;
+ }
+ return TypeInfo(Reference(getUSRForDecl(TD), TD->getNameAsString(),
+ IT, getInfoRelativePath(TD)));
+ }
+ return TypeInfo(Reference(T.getAsString()));
+}
+
static bool isPublic(const clang::AccessSpecifier AS,
const clang::Linkage Link) {
if (AS == clang::AccessSpecifier::AS_private)
@@ -286,28 +308,14 @@
for (const FieldDecl *F : D->fields()) {
if (!shouldSerializeInfo(PublicOnly, /*IsInAnonymousNamespace=*/false, F))
continue;
- if (const auto *T = getDeclForType(F->getTypeSourceInfo()->getType())) {
- // Use getAccessUnsafe so that we just get the default AS_none if it's not
- // valid, as opposed to an assert.
- if (const auto *N = dyn_cast<EnumDecl>(T)) {
- I.Members.emplace_back(
- getUSRForDecl(T), N->getNameAsString(), InfoType::IT_enum,
- getInfoRelativePath(N), F->getNameAsString(),
- getFinalAccessSpecifier(Access, N->getAccessUnsafe()));
- continue;
- } else if (const auto *N = dyn_cast<RecordDecl>(T)) {
- I.Members.emplace_back(
- getUSRForDecl(T), N->getNameAsString(), InfoType::IT_record,
- getInfoRelativePath(N), F->getNameAsString(),
- getFinalAccessSpecifier(Access, N->getAccessUnsafe()));
- continue;
- }
- }
- auto& member = I.Members.emplace_back(
- F->getTypeSourceInfo()->getType().getAsString(), F->getNameAsString(),
+ // Use getAccessUnsafe so that we just get the default AS_none if it's not
+ // valid, as opposed to an assert.
+ MemberTypeInfo &NewMember = I.Members.emplace_back(
+ getTypeInfoForType(F->getTypeSourceInfo()->getType()),
+ F->getNameAsString(),
getFinalAccessSpecifier(Access, F->getAccessUnsafe()));
- populateMemberTypeInfo(member, F);
+ populateMemberTypeInfo(NewMember, F);
}
}
@@ -325,27 +333,12 @@
static void parseParameters(FunctionInfo &I, const FunctionDecl *D) {
for (const ParmVarDecl *P : D->parameters()) {
- FieldTypeInfo *FieldInfo = nullptr;
- if (const auto *T = getDeclForType(P->getOriginalType())) {
- if (const auto *N = dyn_cast<EnumDecl>(T)) {
- FieldInfo = &I.Params.emplace_back(
- getUSRForDecl(N), N->getNameAsString(), InfoType::IT_enum,
- getInfoRelativePath(N), P->getNameAsString());
- } else if (const auto *N = dyn_cast<RecordDecl>(T)) {
- FieldInfo = &I.Params.emplace_back(
- getUSRForDecl(N), N->getNameAsString(), InfoType::IT_record,
- getInfoRelativePath(N), P->getNameAsString());
- }
- // Otherwise fall through to the default case below.
- }
-
- if (!FieldInfo) {
- FieldInfo = &I.Params.emplace_back(P->getOriginalType().getAsString(),
- P->getNameAsString());
- }
+ FieldTypeInfo& FieldInfo = I.Params.emplace_back(
+ getTypeInfoForType(P->getOriginalType()),
+ P->getNameAsString());
if (const Expr *DefaultArg = P->getDefaultArg()) {
- FieldInfo->DefaultValue = getSourceCode(D, DefaultArg->getSourceRange());
+ FieldInfo.DefaultValue = getSourceCode(D, DefaultArg->getSourceRange());
}
}
}
@@ -363,14 +356,14 @@
const TemplateDecl *D = Ty->getTemplateName().getAsTemplateDecl();
I.Parents.emplace_back(getUSRForDecl(D), B.getType().getAsString(),
InfoType::IT_record);
- } else if (const RecordDecl *P = getDeclForType(B.getType()))
+ } else if (const RecordDecl *P = getRecordDeclForType(B.getType()))
I.Parents.emplace_back(getUSRForDecl(P), P->getNameAsString(),
InfoType::IT_record, getInfoRelativePath(P));
else
I.Parents.emplace_back(B.getType().getAsString());
}
for (const CXXBaseSpecifier &B : D->vbases()) {
- if (const auto *P = getDeclForType(B.getType()))
+ if (const RecordDecl *P = getRecordDeclForType(B.getType()))
I.VirtualParents.emplace_back(getUSRForDecl(P), P->getNameAsString(),
InfoType::IT_record,
getInfoRelativePath(P));
@@ -444,16 +437,7 @@
bool &IsInAnonymousNamespace) {
populateSymbolInfo(I, D, FC, LineNumber, Filename, IsFileInRootDir,
IsInAnonymousNamespace);
- if (const auto *T = getDeclForType(D->getReturnType())) {
- if (isa<EnumDecl>(T))
- I.ReturnType = TypeInfo(getUSRForDecl(T), T->getNameAsString(),
- InfoType::IT_enum, getInfoRelativePath(T));
- else if (isa<RecordDecl>(T))
- I.ReturnType = TypeInfo(getUSRForDecl(T), T->getNameAsString(),
- InfoType::IT_record, getInfoRelativePath(T));
- } else {
- I.ReturnType = TypeInfo(D->getReturnType().getAsString());
- }
+ I.ReturnType = getTypeInfoForType(D->getReturnType());
parseParameters(I, D);
}
Index: clang-tools-extra/clang-doc/Representation.h
===================================================================
--- clang-tools-extra/clang-doc/Representation.h
+++ clang-tools-extra/clang-doc/Representation.h
@@ -158,6 +158,8 @@
// A base struct for TypeInfos
struct TypeInfo {
TypeInfo() = default;
+ TypeInfo(const Reference &R) : Type(R) {}
+
TypeInfo(SymbolID Type, StringRef Field, InfoType IT)
: Type(Type, Field, IT) {}
TypeInfo(SymbolID Type, StringRef Field, InfoType IT, StringRef Path)
@@ -173,6 +175,9 @@
// Info for field types.
struct FieldTypeInfo : public TypeInfo {
FieldTypeInfo() = default;
+ FieldTypeInfo(const TypeInfo &TI, StringRef Name = StringRef(),
+ StringRef DefaultValue = StringRef())
+ : TypeInfo(TI), Name(Name), DefaultValue(DefaultValue) {}
FieldTypeInfo(SymbolID Type, StringRef Field, InfoType IT, StringRef Path,
llvm::StringRef Name)
: TypeInfo(Type, Field, IT, Path), Name(Name) {}
@@ -196,6 +201,8 @@
// Info for member types.
struct MemberTypeInfo : public FieldTypeInfo {
MemberTypeInfo() = default;
+ MemberTypeInfo(const TypeInfo &TI, StringRef Name, AccessSpecifier Access)
+ : FieldTypeInfo(TI, Name), Access(Access) {}
MemberTypeInfo(SymbolID Type, StringRef Field, InfoType IT, StringRef Path,
llvm::StringRef Name, AccessSpecifier Access)
: FieldTypeInfo(Type, Field, IT, Path, Name), Access(Access) {}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
