Author: Younan Zhang Date: 2026-04-13T17:10:09+08:00 New Revision: f65301d637076db2232ca6c6d569cc0674e5858a
URL: https://github.com/llvm/llvm-project/commit/f65301d637076db2232ca6c6d569cc0674e5858a DIFF: https://github.com/llvm/llvm-project/commit/f65301d637076db2232ca6c6d569cc0674e5858a.diff LOG: [Clangd] Don't traverse ConceptDecl in typeForNode (#191654) ConceptDecl doesn't have an associated template declaration, and it doesn't introduce a type either. Fixes https://github.com/llvm/llvm-project/issues/188914 Added: Modified: clang-tools-extra/clangd/XRefs.cpp clang-tools-extra/clangd/unittests/XRefsTests.cpp Removed: ################################################################################ diff --git a/clang-tools-extra/clangd/XRefs.cpp b/clang-tools-extra/clangd/XRefs.cpp index 4b685b7bf793e..5f64f01c1ff34 100644 --- a/clang-tools-extra/clangd/XRefs.cpp +++ b/clang-tools-extra/clangd/XRefs.cpp @@ -2058,7 +2058,10 @@ static QualType typeForNode(const ASTContext &Ctx, const HeuristicResolver *H, } // Look inside templates. QualType VisitTemplateDecl(const TemplateDecl *D) { - return Visit(D->getTemplatedDecl()); + if (const auto *TD = D->getTemplatedDecl()) + return Visit(TD); + // ConceptDecl doesn't have any associated templates nor types. + return QualType(); } } V(Ctx); return V.Visit(D); diff --git a/clang-tools-extra/clangd/unittests/XRefsTests.cpp b/clang-tools-extra/clangd/unittests/XRefsTests.cpp index 8e97db7ab17c5..00ead63050c8d 100644 --- a/clang-tools-extra/clangd/unittests/XRefsTests.cpp +++ b/clang-tools-extra/clangd/unittests/XRefsTests.cpp @@ -2094,14 +2094,19 @@ TEST(FindType, All) { TEST(FindType, Definition) { Annotations A(R"cpp( class $decl[[X]]; - X *^x; + X *$x^x; class $def[[X]] {}; + + template <class T> + concept $Concept^True = true; )cpp"); auto TU = TestTU::withCode(A.code().str()); + TU.ExtraArgs.push_back("-std=c++20"); ParsedAST AST = TU.build(); - EXPECT_THAT(findType(AST, A.point(), nullptr), + EXPECT_THAT(findType(AST, A.point("x"), nullptr), ElementsAre(sym("X", A.range("decl"), A.range("def")))); + EXPECT_THAT(findType(AST, A.point("Concept"), nullptr), IsEmpty()); } TEST(FindType, Index) { _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
