https://github.com/owenca created
https://github.com/llvm/llvm-project/pull/86420
Fixes #86109.
>From 682323acb1007308f55bf023e4d1657f268b55d1 Mon Sep 17 00:00:00 2001
From: Owen Pan <owenpi...@gmail.com>
Date: Sat, 23 Mar 2024 22:23:46 -0700
Subject: [PATCH] [clang-format] Fix a crash with AlignArrayOfStructures option
Fixes #86109.
---
clang/lib/Format/WhitespaceManager.cpp | 2 +-
clang/unittests/Format/FormatTest.cpp | 10 ++++++++++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/clang/lib/Format/WhitespaceManager.cpp
b/clang/lib/Format/WhitespaceManager.cpp
index fef85abf79a38c..710bf8d8a8ec70 100644
--- a/clang/lib/Format/WhitespaceManager.cpp
+++ b/clang/lib/Format/WhitespaceManager.cpp
@@ -1491,7 +1491,7 @@ WhitespaceManager::CellDescriptions
WhitespaceManager::getCells(unsigned Start,
: Cell);
// Go to the next non-comment and ensure there is a break in front
const auto *NextNonComment = C.Tok->getNextNonComment();
- while (NextNonComment->is(tok::comma))
+ while (NextNonComment && NextNonComment->is(tok::comma))
NextNonComment = NextNonComment->getNextNonComment();
auto j = i;
while (j < End && Changes[j].Tok != NextNonComment)
diff --git a/clang/unittests/Format/FormatTest.cpp
b/clang/unittests/Format/FormatTest.cpp
index cf8d6ab691d9a0..a33520d81b8421 100644
--- a/clang/unittests/Format/FormatTest.cpp
+++ b/clang/unittests/Format/FormatTest.cpp
@@ -21101,6 +21101,11 @@ TEST_F(FormatTest,
CatchAlignArrayOfStructuresRightAlignment) {
" [1] { 1, 1, },\n"
" [2] { 1, 1, },\n"
"};");
+ verifyNoCrash("test arr[] = {\n"
+ "#define FOO(i) {i, i},\n"
+ "SOME_GENERATOR(FOO)\n"
+ "{2, 2}\n"
+ "};");
verifyFormat("return GradForUnaryCwise(g, {\n"
" {{\"sign\"}, \"Sign\", "
@@ -21354,6 +21359,11 @@ TEST_F(FormatTest,
CatchAlignArrayOfStructuresLeftAlignment) {
" [1] { 1, 1, },\n"
" [2] { 1, 1, },\n"
"};");
+ verifyNoCrash("test arr[] = {\n"
+ "#define FOO(i) {i, i},\n"
+ "SOME_GENERATOR(FOO)\n"
+ "{2, 2}\n"
+ "};");
verifyFormat("return GradForUnaryCwise(g, {\n"
" {{\"sign\"}, \"Sign\", {\"x\",
"
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
