diff --git a/clang-tools-extra/clangd/unittests/HoverTests.cpp b/clang-tools-extra/clangd/unittests/HoverTests.cpp --- a/clang-tools-extra/clangd/unittests/HoverTests.cpp +++ b/clang-tools-extra/clangd/unittests/HoverTests.cpp @@ -3200,6 +3200,24 @@ EXPECT_EQ(*HI->Value, "&bar"); } +TEST(Hover, ClassNTTPNoCrash) { + Annotations T(R"cpp( + struct A { + template constexpr A(const char (&)[N]) : n(N) {} + unsigned n; + }; + template constexpr auto operator""_a() { return a.n; } + constexpr auto w^aldo = "abc"_a; + )cpp"); + TestTU TU = TestTU::withCode(T.code()); + TU.ExtraArgs.push_back("-std=c++20"); + auto AST = TU.build(); + auto HI = getHover(AST, T.point(), format::getLLVMStyle(), nullptr); + ASSERT_TRUE(HI); + EXPECT_EQ(HI->Definition, "constexpr auto waldo = operator\"\"_a<{4}>()"); + EXPECT_EQ(*HI->Value, "4"); +} + TEST(Hover, DisableShowAKA) { Annotations T(R"cpp( using m_int = int; diff --git a/clang/lib/AST/StmtPrinter.cpp b/clang/lib/AST/StmtPrinter.cpp --- a/clang/lib/AST/StmtPrinter.cpp +++ b/clang/lib/AST/StmtPrinter.cpp @@ -1993,7 +1993,7 @@ cast(DRE->getDecl())->getTemplateSpecializationArgs(); assert(Args); - if (Args->size() != 1) { + if (Args->size() != 1 || Args->get(0).getKind() != TemplateArgument::Pack) { const TemplateParameterList *TPL = nullptr; if (!DRE->hadMultipleCandidates()) if (const auto *TD = dyn_cast(DRE->getDecl()))