Author: Emilia Dreamer Date: 2023-03-23T19:37:53+02:00 New Revision: c70e360b355ad30a7dd299435aae0324c5033b3f
URL: https://github.com/llvm/llvm-project/commit/c70e360b355ad30a7dd299435aae0324c5033b3f DIFF: https://github.com/llvm/llvm-project/commit/c70e360b355ad30a7dd299435aae0324c5033b3f.diff LOG: [clang-format] Allow trailing return types in macros The trailing return type arrow checker verifies that a declaration is being parsed, however, this isn't true when inside of macros. It turns out the existence of the auto keyword is enough to make sure that we're dealing with a trailing return type, and whether we're in a declaration doesn't matter. Fixes https://github.com/llvm/llvm-project/issues/47664 Reviewed By: HazardyKnusperkeks, owenpan Differential Revision: https://reviews.llvm.org/D141811 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 55be50aec203e..5dbda8fbe0719 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -1909,7 +1909,8 @@ class AnnotatingParser { } else if (Current.is(tok::arrow) && Style.Language == FormatStyle::LK_Java) { Current.setType(TT_LambdaArrow); - } else if (Current.is(tok::arrow) && AutoFound && Line.MustBeDeclaration && + } else if (Current.is(tok::arrow) && AutoFound && + (Line.MustBeDeclaration || Line.InPPDirective) && Current.NestingLevel == 0 && !Current.Previous->isOneOf(tok::kw_operator, tok::identifier)) { // not auto operator->() -> xxx; diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index eeb1234999a10..eb1b563b3d2c3 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -8010,6 +8010,11 @@ TEST_F(FormatTest, TrailingReturnType) { "auto aaaaaaaaaaaaaaaaaaaaaa(T t)\n" " -> decltype(eaaaaaaaaaaaaaaa<T>(t.a).aaaaaaaa());"); + FormatStyle Style = getLLVMStyleWithColumns(60); + verifyFormat("#define MAKE_DEF(NAME) \\\n" + " auto NAME() -> int { return 42; }", + Style); + // Not trailing return types. verifyFormat("void f() { auto a = b->c(); }"); verifyFormat("auto a = p->foo();"); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
