Author: Owen Pan Date: 2025-07-24T09:41:22-07:00 New Revision: a4d4859dc70c046ad928805ddeaf8fa101793394
URL: https://github.com/llvm/llvm-project/commit/a4d4859dc70c046ad928805ddeaf8fa101793394 DIFF: https://github.com/llvm/llvm-project/commit/a4d4859dc70c046ad928805ddeaf8fa101793394.diff LOG: [clang-format] Fix a bug in `DerivePointerAlignment: true` (#150387) Fixes #150327 Added: Modified: clang/lib/Format/Format.cpp clang/unittests/Format/FormatTest.cpp Removed: ################################################################################ diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp index f247af6718437..1cfa3d1535902 100644 --- a/clang/lib/Format/Format.cpp +++ b/clang/lib/Format/Format.cpp @@ -2644,13 +2644,14 @@ class Formatter : public TokenAnalyzer { for (FormatToken *Tok = Line->First; Tok && Tok->Next; Tok = Tok->Next) { if (Tok->isNot(TT_PointerOrReference)) continue; - // Don't treat space in `void foo() &&` as evidence. + // Don't treat space in `void foo() &&` or `void() &&` as evidence. if (const auto *Prev = Tok->getPreviousNonComment()) { if (Prev->is(tok::r_paren) && Prev->MatchingParen) { if (const auto *Func = Prev->MatchingParen->getPreviousNonComment()) { if (Func->isOneOf(TT_FunctionDeclarationName, TT_StartOfName, - TT_OverloadedOperator)) { + TT_OverloadedOperator) || + Func->isTypeName(LangOpts)) { continue; } } diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index 48aa0616d1a6b..c20d099cac017 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -12113,6 +12113,8 @@ TEST_F(FormatTest, UnderstandsFunctionRefQualification) { Prefix = "void a() const &;\n" "void b() const &;\n"; verifyFormat(Prefix + "int *x;", Prefix + "int* x;", DerivePointerAlignment); + + verifyGoogleFormat("MACRO(int*, std::function<void() &&>);"); } TEST_F(FormatTest, PointerAlignmentFallback) { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
