maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[clangd] Avoid crash when printing call to string literal operator template 

Differential Revision: https://reviews.llvm.org/D132830
This commit is contained in:
Nathan Ridge 2022-08-29 04:19:19 -04:00
parent 961fd77687
commit 898c421975
2 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/lib/AST/StmtPrinter.cpp
View File

@ -1993,7 +1993,7 @@ void StmtPrinter::VisitUserDefinedLiteral(UserDefinedLiteral *Node) {
cast<FunctionDecl>(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<TemplateDecl>(DRE->getDecl()))

35
clang/unittests/AST/StmtPrinterTest.cpp
View File

@ -31,7 +31,7 @@ using namespace tooling;
namespace {
enum class StdVer { CXX98, CXX11, CXX14, CXX17, CXX2a };
enum class StdVer { CXX98, CXX11, CXX14, CXX17, CXX20 };
DeclarationMatcher FunctionBodyMatcher(StringRef ContainingFunction) {
return functionDecl(hasName(ContainingFunction),
@ -67,7 +67,9 @@ PrintedStmtCXXMatches(StdVer Standard, StringRef Code, const T &NodeMatch,
case StdVer::CXX11: StdOpt = "-std=c++11"; break;
case StdVer::CXX14: StdOpt = "-std=c++14"; break;
case StdVer::CXX17: StdOpt = "-std=c++17"; break;
case StdVer::CXX2a: StdOpt = "-std=c++2a"; break;
case StdVer::CXX20:
StdOpt = "-std=c++20";
break;
}
std::vector<std::string> Args = {
@ -146,6 +148,35 @@ TEST(StmtPrinter, TestFloatingPointLiteral) {
// Should be: with semicolon
}
TEST(StmtPrinter, TestStringLiteralOperatorTemplate_Pack) {
ASSERT_TRUE(PrintedStmtCXXMatches(StdVer::CXX11,
R"cpp(
template <char...> constexpr double operator""_c() { return 42; }
void A() {
constexpr auto waldo = 42_c;
}
)cpp",
FunctionBodyMatcher("A"),
"constexpr auto waldo = 42_c;\n"));
}
TEST(StmtPrinter, TestStringLiteralOperatorTemplate_Class) {
ASSERT_TRUE(
PrintedStmtCXXMatches(StdVer::CXX20,
R"cpp(
struct C {
template <unsigned N> constexpr C(const char (&)[N]) : n(N) {}
unsigned n;
};
template <C c> constexpr auto operator""_c() { return c.n; }
void A() {
constexpr auto waldo = "abc"_c;
}
)cpp",
FunctionBodyMatcher("A"),
"constexpr auto waldo = operator\"\"_c<{4}>();\n"));
}
TEST(StmtPrinter, TestCXXConversionDeclImplicit) {
ASSERT_TRUE(PrintedStmtCXXMatches(
StdVer::CXX98,