[llvm-branch-commits] [clang-tools-extra] release/23.x: [clang-tidy] Fix false positive in readability-trailing-comma (PR #236390)

via llvm-branch-commits llvm-branch-commits at lists.llvm.org
Wed Oct 28 05:01:44 PDT 2026


https://github.com/vadikmironov created https://github.com/llvm/llvm-project/pull/236390

Manual backport of #220548, requested in https://github.com/llvm/llvm-project/pull/220548#issuecomment-6455859854.

The cherry-pick bot failed because release/23.x has no `ReleaseNotes.md`. This leaves out the release-notes change, as #220791 did. The code and test changes are the same as in the original.

Prepared with Claude Code.


>From 4eb180962bb50986c17ecfea8b834e52fe310dad Mon Sep 17 00:00:00 2001
From: Peiqi Li <voyager.lpq at gmail.com>
Date: Fri, 4 Sep 2026 19:13:12 +0800
Subject: [PATCH] [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)
---
 .../clang-tidy/readability/TrailingCommaCheck.cpp      |  6 ++++--
 .../checkers/readability/trailing-comma-cxx11.cpp      | 10 ++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

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