kiloalphaindia created this revision.
kiloalphaindia added a reviewer: cor3ntin.
Herald added a subscriber: arphaman.
Herald added a project: All.
kiloalphaindia requested review of this revision.
Herald added subscribers: cfe-commits, wangpc.
Herald added a project: clang.
After implementation of "[Clang] Implement P2741R3 - user-generated
static_assert messages" (47ccfd7a89e2a9a747a7114db18db1376324799c
<https://reviews.llvm.org/rG47ccfd7a89e2a9a747a7114db18db1376324799c>) the c
indexer crashes when handling a static cast w/o any message.
This is caused by using `dyn_cast` to get the literal string, which isn't
working on `nullptr`.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D156053
Files:
clang/tools/libclang/CIndex.cpp
clang/unittests/libclang/LibclangTest.cpp
Index: clang/unittests/libclang/LibclangTest.cpp
===================================================================
--- clang/unittests/libclang/LibclangTest.cpp
+++ clang/unittests/libclang/LibclangTest.cpp
@@ -1172,6 +1172,25 @@
});
}
+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<CXCursor> typeRefCsr;
+ Traverse([&](CXCursor cursor, CXCursor parent) -> CXChildVisitResult {
+ if (cursor.kind == CXCursor_StaticAssert) {
+ typeRefCsr.emplace(cursor);
+ }
+ return CXChildVisit_Recurse;
+ });
+ ASSERT_TRUE(typeRefCsr.has_value());
+ EXPECT_EQ(fromCXString(clang_getCursorSpelling(*typeRefCsr)), "");
+}
+
class LibclangRewriteTest : public LibclangParseTest {
public:
CXRewriter Rew = nullptr;
Index: clang/tools/libclang/CIndex.cpp
===================================================================
--- clang/tools/libclang/CIndex.cpp
+++ clang/tools/libclang/CIndex.cpp
@@ -1294,7 +1294,7 @@
bool CursorVisitor::VisitStaticAssertDecl(StaticAssertDecl *D) {
if (Visit(MakeCXCursor(D->getAssertExpr(), StmtParent, TU,
RegionOfInterest)))
return true;
- if (auto *Message = dyn_cast<StringLiteral>(D->getMessage()))
+ if (auto *Message = dyn_cast_if_present<StringLiteral>(D->getMessage()))
if (Visit(MakeCXCursor(Message, StmtParent, TU, RegionOfInterest)))
return true;
return false;
Index: clang/unittests/libclang/LibclangTest.cpp
===================================================================
--- clang/unittests/libclang/LibclangTest.cpp
+++ clang/unittests/libclang/LibclangTest.cpp
@@ -1172,6 +1172,25 @@
});
}
+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<CXCursor> typeRefCsr;
+ Traverse([&](CXCursor cursor, CXCursor parent) -> CXChildVisitResult {
+ if (cursor.kind == CXCursor_StaticAssert) {
+ typeRefCsr.emplace(cursor);
+ }
+ return CXChildVisit_Recurse;
+ });
+ ASSERT_TRUE(typeRefCsr.has_value());
+ EXPECT_EQ(fromCXString(clang_getCursorSpelling(*typeRefCsr)), "");
+}
+
class LibclangRewriteTest : public LibclangParseTest {
public:
CXRewriter Rew = nullptr;
Index: clang/tools/libclang/CIndex.cpp
===================================================================
--- clang/tools/libclang/CIndex.cpp
+++ clang/tools/libclang/CIndex.cpp
@@ -1294,7 +1294,7 @@
bool CursorVisitor::VisitStaticAssertDecl(StaticAssertDecl *D) {
if (Visit(MakeCXCursor(D->getAssertExpr(), StmtParent, TU, RegionOfInterest)))
return true;
- if (auto *Message = dyn_cast<StringLiteral>(D->getMessage()))
+ if (auto *Message = dyn_cast_if_present<StringLiteral>(D->getMessage()))
if (Visit(MakeCXCursor(Message, StmtParent, TU, RegionOfInterest)))
return true;
return false;
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
