diff --git a/clang-tools-extra/clangd/ExpectedTypes.cpp b/clang-tools-extra/clangd/ExpectedTypes.cpp --- a/clang-tools-extra/clangd/ExpectedTypes.cpp +++ b/clang-tools-extra/clangd/ExpectedTypes.cpp @@ -44,12 +44,10 @@ static llvm::Optional typeOfCompletion(const CodeCompletionResult &R) { const NamedDecl *D = R.Declaration; - if (!D) - return llvm::None; // Templates do not have a type on their own, look at the templated decl. - if (auto *Template = dyn_cast(D)) + if (auto *Template = dyn_cast_or_null(D)) D = Template->getTemplatedDecl(); - auto *VD = dyn_cast(D); + auto *VD = dyn_cast_or_null(D); if (!VD) return llvm::None; // We handle only variables and functions below. auto T = VD->getType(); diff --git a/clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp b/clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp --- a/clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp +++ b/clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp @@ -1030,6 +1030,16 @@ SnippetSuffix("(${1:int A})")))); } +TEST(CompletionTest, NoCrashWithTemplateParamsAndPreferredTypes) { + auto Completions = completions(R"cpp( +template