Author: Haojian Wu Date: 2020-02-21T09:42:02+01:00 New Revision: e326f52430419af1ca5aed635168672fbaab5654
URL: https://github.com/llvm/llvm-project/commit/e326f52430419af1ca5aed635168672fbaab5654 DIFF: https://github.com/llvm/llvm-project/commit/e326f52430419af1ca5aed635168672fbaab5654.diff LOG: [clangd] Fix the incomplete template specialization in findTarget. Summary: FindTarget doesn't report the TemplatePattern for incomplete specialization. Reviewers: sammccall Subscribers: ilya-biryukov, MaskRay, jkorous, arphaman, kadircet, usaxena95, cfe-commits Tags: #clang Differential Revision: https://reviews.llvm.org/D74900 Added: Modified: clang-tools-extra/clangd/FindTarget.cpp clang-tools-extra/clangd/unittests/FindTargetTests.cpp clang-tools-extra/clangd/unittests/XRefsTests.cpp Removed: ################################################################################ diff --git a/clang-tools-extra/clangd/FindTarget.cpp b/clang-tools-extra/clangd/FindTarget.cpp index 685079f0ebe8..4528e2a77164 100644 --- a/clang-tools-extra/clangd/FindTarget.cpp +++ b/clang-tools-extra/clangd/FindTarget.cpp @@ -31,6 +31,7 @@ #include "clang/Basic/LangOptions.h" #include "clang/Basic/OperatorKinds.h" #include "clang/Basic/SourceLocation.h" +#include "clang/Basic/Specifiers.h" #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/SmallVector.h" #include "llvm/Support/Casting.h" @@ -139,7 +140,14 @@ const Type *getPointeeType(const Type *T) { const NamedDecl *getTemplatePattern(const NamedDecl *D) { if (const CXXRecordDecl *CRD = dyn_cast<CXXRecordDecl>(D)) { - return CRD->getTemplateInstantiationPattern(); + if (const auto *Result = CRD->getTemplateInstantiationPattern()) + return Result; + // getTemplateInstantiationPattern returns null if the Specialization is + // incomplete (e.g. the type didn't need to be complete), fall back to the + // primary template. + if (CRD->getTemplateSpecializationKind() == TSK_Undeclared) + if (const auto *Spec = dyn_cast<ClassTemplateSpecializationDecl>(CRD)) + return Spec->getSpecializedTemplate()->getTemplatedDecl(); } else if (const FunctionDecl *FD = dyn_cast<FunctionDecl>(D)) { return FD->getTemplateInstantiationPattern(); } else if (auto *VD = dyn_cast<VarDecl>(D)) { diff --git a/clang-tools-extra/clangd/unittests/FindTargetTests.cpp b/clang-tools-extra/clangd/unittests/FindTargetTests.cpp index fa091b2a2503..5cf94b6ff6b0 100644 --- a/clang-tools-extra/clangd/unittests/FindTargetTests.cpp +++ b/clang-tools-extra/clangd/unittests/FindTargetTests.cpp @@ -309,6 +309,16 @@ TEST_F(TargetDeclTest, ClassTemplate) { {"template<> class Foo<42>", Rel::TemplateInstantiation}, {"class Foo", Rel::TemplatePattern}); + Code = R"cpp( + template<typename T> class Foo {}; + // The "Foo<int>" SpecializationDecl is incomplete, there is no + // instantiation happening. + void func([[Foo<int>]] *); + )cpp"; + EXPECT_DECLS("TemplateSpecializationTypeLoc", + {"class Foo", Rel::TemplatePattern}, + {"template<> class Foo<int>", Rel::TemplateInstantiation}); + Code = R"cpp( // Explicit specialization. template<int x> class Foo{}; diff --git a/clang-tools-extra/clangd/unittests/XRefsTests.cpp b/clang-tools-extra/clangd/unittests/XRefsTests.cpp index 31c965087547..27b717b0e1c2 100644 --- a/clang-tools-extra/clangd/unittests/XRefsTests.cpp +++ b/clang-tools-extra/clangd/unittests/XRefsTests.cpp @@ -954,6 +954,12 @@ TEST(FindReferences, WithinAST) { class [[Fo^o]] {}; void func([[Foo]]<int>); )cpp", + + R"cpp( + template <typename T> + class [[Foo]] {}; + void func([[Fo^o]]<int>); + )cpp", }; for (const char *Test : Tests) { Annotations T(Test); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
