Author: owenca Date: 2026-03-20T22:21:58-07:00 New Revision: d7fe9c87ce9a5fc5b48d6b19415542f5807fc154
URL: https://github.com/llvm/llvm-project/commit/d7fe9c87ce9a5fc5b48d6b19415542f5807fc154 DIFF: https://github.com/llvm/llvm-project/commit/d7fe9c87ce9a5fc5b48d6b19415542f5807fc154.diff LOG: [clang-format] Handle sizeof in C compound literals (#187633) Fixes #168237 Added: Modified: clang/lib/Format/TokenAnnotator.cpp clang/unittests/Format/FormatTest.cpp Removed: ################################################################################ diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 55a6d1a9427f9..ee14469cfc968 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -4991,6 +4991,17 @@ bool TokenAnnotator::spaceRequiredBetween(const AnnotatedLine &Line, spaceRequiredBeforeParens(Right); } } + auto CompoundLiteral = [](const FormatToken &Tok) { + if (Tok.isNot(tok::l_paren)) + return false; + const auto *RParen = Tok.MatchingParen; + if (!RParen) + return false; + const auto *Next = RParen->Next; + return Next && Next->is(tok::l_brace) && Next->is(BK_BracedInit); + }; + if (Left.is(tok::kw_sizeof) && CompoundLiteral(Right)) + return true; // Handle builtins like identifiers. if (Line.Type != LT_PreprocessorDirective && (Left.Tok.getIdentifierInfo() || Left.is(tok::r_paren))) { diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index 7628195e74a77..f88f930bfd23f 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -17532,6 +17532,8 @@ TEST_F(FormatTest, ConfigurableSpaceBeforeParens) { "#elif ((a || b) && c) || d\n" "#endif", NoSpace); + // Space between sizeof and C compound literal. + verifyFormat("a = sizeof (int){};", NoSpace); FormatStyle Space = getLLVMStyle(); Space.SpaceBeforeParens = FormatStyle::SBPO_Always; _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
