nridge created this revision.
nridge added a reviewer: hokein.
Herald added subscribers: cfe-commits, usaxena95, kadircet, arphaman, jkorous,
MaskRay, ilya-biryukov.
Herald added a project: clang.
Two helpers are introduced:
- Some of the logic previously in TargetFinder::Visit*() methods is factored
out into resolveDependentExprToDecls().
- Some of the logic in getMembersReferencedViaDependentName() is factored out
into resolveTypeToRecordDecl().
D82739 <https://reviews.llvm.org/D82739> will build on this and use these
functions in new ways.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D83371
Files:
clang-tools-extra/clangd/FindTarget.cpp
Index: clang-tools-extra/clangd/FindTarget.cpp
===================================================================
--- clang-tools-extra/clangd/FindTarget.cpp
+++ clang-tools-extra/clangd/FindTarget.cpp
@@ -58,6 +58,27 @@
return S;
}
+// Helper function for getMembersReferencedViaDependentName()
+// which takes a possibly-dependent type `T` and heuristically
+// resolves it to a CXXRecordDecl in which we can try name lookup.
+CXXRecordDecl *resolveTypeToRecordDecl(const Type *T) {
+ if (auto *RT = T->getAs<RecordType>()) {
+ return dyn_cast<CXXRecordDecl>(RT->getDecl());
+ }
+
+ if (auto *ICNT = T->getAs<InjectedClassNameType>()) {
+ T = ICNT->getInjectedSpecializationType().getTypePtrOrNull();
+ }
+ auto *TST = T->getAs<TemplateSpecializationType>();
+ if (!TST)
+ return nullptr;
+ const ClassTemplateDecl *TD = dyn_cast_or_null<ClassTemplateDecl>(
+ TST->getTemplateName().getAsTemplateDecl());
+ if (!TD)
+ return nullptr;
+ return TD->getTemplatedDecl();
+}
+
// Given a dependent type and a member name, heuristically resolve the
// name to one or more declarations.
// The current heuristic is simply to look up the name in the primary
@@ -82,25 +103,17 @@
ET->getDecl()->lookup(NameFactory(ET->getDecl()->getASTContext()));
return {Result.begin(), Result.end()};
}
- if (auto *ICNT = T->getAs<InjectedClassNameType>()) {
- T = ICNT->getInjectedSpecializationType().getTypePtrOrNull();
+ if (auto *RD = resolveTypeToRecordDecl(T)) {
+ if (!RD->hasDefinition())
+ return {};
+ RD = RD->getDefinition();
+ DeclarationName Name = NameFactory(RD->getASTContext());
+ return RD->lookupDependentName(Name, [=](const NamedDecl *D) {
+ return IsNonstaticMember ? D->isCXXInstanceMember()
+ : !D->isCXXInstanceMember();
+ });
}
- auto *TST = T->getAs<TemplateSpecializationType>();
- if (!TST)
- return {};
- const ClassTemplateDecl *TD = dyn_cast_or_null<ClassTemplateDecl>(
- TST->getTemplateName().getAsTemplateDecl());
- if (!TD)
- return {};
- CXXRecordDecl *RD = TD->getTemplatedDecl();
- if (!RD->hasDefinition())
- return {};
- RD = RD->getDefinition();
- DeclarationName Name = NameFactory(RD->getASTContext());
- return RD->lookupDependentName(Name, [=](const NamedDecl *D) {
- return IsNonstaticMember ? D->isCXXInstanceMember()
- : !D->isCXXInstanceMember();
- });
+ return {};
}
// Given the type T of a dependent expression that appears of the LHS of a "->",
@@ -144,6 +157,32 @@
return FirstArg.getAsType().getTypePtrOrNull();
}
+// Try to heuristically resolve a dependent expression `E` to one
+// or more declarations that it likely references.
+std::vector<const NamedDecl *> resolveDependentExprToDecls(const Expr *E) {
+ switch (E->getStmtClass()) {
+ case Stmt::CXXDependentScopeMemberExprClass: {
+ const auto *ME = llvm::cast<CXXDependentScopeMemberExpr>(E);
+ const Type *BaseType = ME->getBaseType().getTypePtrOrNull();
+ if (ME->isArrow()) {
+ BaseType = getPointeeType(BaseType);
+ }
+ return getMembersReferencedViaDependentName(
+ BaseType, [ME](ASTContext &) { return ME->getMember(); },
+ /*IsNonstaticMember=*/true);
+ }
+ case Stmt::DependentScopeDeclRefExprClass: {
+ const auto *RE = llvm::cast<DependentScopeDeclRefExpr>(E);
+ return getMembersReferencedViaDependentName(
+ RE->getQualifier()->getAsType(),
+ [RE](ASTContext &) { return RE->getDeclName(); },
+ /*IsNonstaticMember=*/false);
+ }
+ default:
+ return {};
+ }
+}
+
const NamedDecl *getTemplatePattern(const NamedDecl *D) {
if (const CXXRecordDecl *CRD = dyn_cast<CXXRecordDecl>(D)) {
if (const auto *Result = CRD->getTemplateInstantiationPattern())
@@ -341,21 +380,12 @@
}
void
VisitCXXDependentScopeMemberExpr(const CXXDependentScopeMemberExpr *E) {
- const Type *BaseType = E->getBaseType().getTypePtrOrNull();
- if (E->isArrow()) {
- BaseType = getPointeeType(BaseType);
- }
- for (const NamedDecl *D : getMembersReferencedViaDependentName(
- BaseType, [E](ASTContext &) { return E->getMember(); },
- /*IsNonstaticMember=*/true)) {
+ for (const NamedDecl *D : resolveDependentExprToDecls(E)) {
Outer.add(D, Flags);
}
}
void VisitDependentScopeDeclRefExpr(const DependentScopeDeclRefExpr *E) {
- for (const NamedDecl *D : getMembersReferencedViaDependentName(
- E->getQualifier()->getAsType(),
- [E](ASTContext &) { return E->getDeclName(); },
- /*IsNonstaticMember=*/false)) {
+ for (const NamedDecl *D : resolveDependentExprToDecls(E)) {
Outer.add(D, Flags);
}
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
