[llvm-branch-commits] [clang-tools-extra] 31dea7a - [clang-tidy] Fix false positive in readability-trailing-comma (#220548)
Tobias Hieta via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Sun Nov 15 12:05:35 PST 2026
Author: Peiqi Li
Date: 2026-11-15T21:03:42+01:00
New Revision: 31dea7a7eb1ec160f5ced200368c9b0ce3196ec2
URL: https://github.com/llvm/llvm-project/commit/31dea7a7eb1ec160f5ced200368c9b0ce3196ec2
DIFF: https://github.com/llvm/llvm-project/commit/31dea7a7eb1ec160f5ced200368c9b0ce3196ec2.diff
LOG: [clang-tidy] Fix false positive in readability-trailing-comma (#220548)
Use the syntactic form of an empty InitListExpr instead of falling back
to the semantic form.
Fixes #220222
(cherry picked from commit 0abb55638843428fccd7a923e6126fcb74a69a51)
Added:
Modified:
clang-tools-extra/clang-tidy/readability/TrailingCommaCheck.cpp
clang-tools-extra/test/clang-tidy/checkers/readability/trailing-comma-cxx11.cpp
Removed:
################################################################################
diff --git a/clang-tools-extra/clang-tidy/readability/TrailingCommaCheck.cpp b/clang-tools-extra/clang-tidy/readability/TrailingCommaCheck.cpp
index cb1a33ba09233e..d687980ed09996 100644
--- a/clang-tools-extra/clang-tidy/readability/TrailingCommaCheck.cpp
+++ b/clang-tools-extra/clang-tidy/readability/TrailingCommaCheck.cpp
@@ -122,9 +122,11 @@ void TrailingCommaCheck::checkEnumDecl(const EnumDecl *Enum,
void TrailingCommaCheck::checkInitListExpr(
const InitListExpr *InitList, const MatchFinder::MatchResult &Result) {
// We need to use non-empty syntactic form for correct source locations.
- if (const InitListExpr *SynInitInitList = InitList->getSyntacticForm();
- SynInitInitList && SynInitInitList->getNumInits() > 0)
+ if (const InitListExpr *SynInitInitList = InitList->getSyntacticForm()) {
+ if (SynInitInitList->getNumInits() == 0)
+ return;
InitList = SynInitInitList;
+ }
const bool IsSingleLine = isSingleLine(
{InitList->getBeginLoc(), InitList->getEndLoc()}, *Result.SourceManager);
diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/trailing-comma-cxx11.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/trailing-comma-cxx11.cpp
index 9f37db2c837c39..5d836b7727082c 100644
--- a/clang-tools-extra/test/clang-tidy/checkers/readability/trailing-comma-cxx11.cpp
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability/trailing-comma-cxx11.cpp
@@ -54,3 +54,13 @@ struct PackSingle {
PackSingle<int> p1;
PackSingle<int, double, char> p3;
+
+struct WithDefault { int foo = 1; };
+void takesTwo(WithDefault, int);
+
+void emptyInitListWithDefaultMember() {
+ takesTwo(WithDefault{}, 1);
+ int a[] = {1,};
+ // CHECK-MESSAGES: :[[@LINE-1]]:15: warning: initializer list should not have a trailing comma
+ // CHECK-FIXES: int a[] = {1};
+}
More information about the llvm-branch-commits
mailing list