From 86da763ab6ed19c58349d3f6f62d4bb52becab2c Mon Sep 17 00:00:00 2001 From: Kai Stierand Date: Tue, 25 Jul 2023 10:36:53 +0200 Subject: [Clang] Fix crash in CIndex, when visiting a static_assert without message After implementation of "[Clang] Implement P2741R3 - user-generated static_assert messages" (47ccfd7a89e2a9a747a7114db18db1376324799c) the c indexer crashes when handling a `static_assert` w/o any message. This is caused by using `dyn_cast` to get the literal string, which isn't working on `nullptr`. Reviewed By: cor3ntin Differential Revision: https://reviews.llvm.org/D156053 --- clang/unittests/libclang/LibclangTest.cpp | 74 +++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) (limited to 'clang/unittests/libclang/LibclangTest.cpp') diff --git a/clang/unittests/libclang/LibclangTest.cpp b/clang/unittests/libclang/LibclangTest.cpp index f85a72b..b1f6534 100644 --- a/clang/unittests/libclang/LibclangTest.cpp +++ b/clang/unittests/libclang/LibclangTest.cpp @@ -1172,6 +1172,80 @@ TEST_F(LibclangParseTest, UnaryOperator) { }); } +TEST_F(LibclangParseTest, VisitStaticAssertDecl_noMessage) { + const char testSource[] = R"cpp(static_assert(true))cpp"; + std::string fileName = "main.cpp"; + WriteFile(fileName, testSource); + const char *Args[] = {"-xc++"}; + ClangTU = clang_parseTranslationUnit(Index, fileName.c_str(), Args, 1, + nullptr, 0, TUFlags); + + std::optional staticAssertCsr; + Traverse([&](CXCursor cursor, CXCursor parent) -> CXChildVisitResult { + if (cursor.kind == CXCursor_StaticAssert) { + staticAssertCsr.emplace(cursor); + return CXChildVisit_Break; + } + return CXChildVisit_Recurse; + }); + ASSERT_TRUE(staticAssertCsr.has_value()); + Traverse(*staticAssertCsr, [](CXCursor cursor, CXCursor parent) { + EXPECT_EQ(cursor.kind, CXCursor_CXXBoolLiteralExpr); + return CXChildVisit_Break; + }); + EXPECT_EQ(fromCXString(clang_getCursorSpelling(*staticAssertCsr)), ""); +} + +TEST_F(LibclangParseTest, VisitStaticAssertDecl_exprMessage) { + const char testSource[] = R"cpp( +template +constexpr unsigned size(const char (&)[s]) +{ + return s - 1; +} + +struct Message { + static constexpr char message[] = "Hello World!"; + constexpr const char* data() const { return message;} + constexpr unsigned size() const + { + return ::size(message); + } +}; +Message message; +static_assert(true, message); +)cpp"; + std::string fileName = "main.cpp"; + WriteFile(fileName, testSource); + const char *Args[] = {"-xc++", "-std=c++26"}; + ClangTU = clang_parseTranslationUnit(Index, fileName.c_str(), Args, + std::size(Args), nullptr, 0, TUFlags); + ASSERT_EQ(clang_getNumDiagnostics(ClangTU), 0); + std::optional staticAssertCsr; + Traverse([&](CXCursor cursor, CXCursor parent) -> CXChildVisitResult { + if (cursor.kind == CXCursor_StaticAssert) { + staticAssertCsr.emplace(cursor); + } + return CXChildVisit_Continue; + }); + ASSERT_TRUE(staticAssertCsr.has_value()); + size_t argCnt = 0; + Traverse(*staticAssertCsr, [&argCnt](CXCursor cursor, CXCursor parent) { + switch (argCnt) { + case 0: + EXPECT_EQ(cursor.kind, CXCursor_CXXBoolLiteralExpr); + break; + case 1: + EXPECT_EQ(cursor.kind, CXCursor_DeclRefExpr); + break; + } + ++argCnt; + return CXChildVisit_Continue; + }); + ASSERT_EQ(argCnt, 2); + EXPECT_EQ(fromCXString(clang_getCursorSpelling(*staticAssertCsr)), ""); +} + class LibclangRewriteTest : public LibclangParseTest { public: CXRewriter Rew = nullptr; -- cgit v1.1