[clang] a0710e1 - Revert "[clang-format] Handle variable declarations in BreakAfterAttributes (#71755)"
Owen Pan via cfe-commits
cfe-commits at lists.llvm.org
Thu Nov 9 23:34:15 PST 2023
Author: Owen Pan
Date: 2023-11-09T23:34:06-08:00
New Revision: a0710e162dac8eb845588779deb39f2b35e5cb88
URL: https://github.com/llvm/llvm-project/commit/a0710e162dac8eb845588779deb39f2b35e5cb88
DIFF: https://github.com/llvm/llvm-project/commit/a0710e162dac8eb845588779deb39f2b35e5cb88.diff
LOG: Revert "[clang-format] Handle variable declarations in BreakAfterAttributes (#71755)"
This reverts commit 5c36f4332d93c6f9bd9b01a34149a635e07a00d3 which caused a
formatting error in polly.
Added:
Modified:
clang/docs/ClangFormatStyleOptions.rst
clang/include/clang/Format/Format.h
clang/lib/Format/TokenAnnotator.cpp
clang/unittests/Format/FormatTest.cpp
Removed:
################################################################################
diff --git a/clang/docs/ClangFormatStyleOptions.rst b/clang/docs/ClangFormatStyleOptions.rst
index d496fc85f7ae71a..21342e1b89ea866 100644
--- a/clang/docs/ClangFormatStyleOptions.rst
+++ b/clang/docs/ClangFormatStyleOptions.rst
@@ -2049,8 +2049,8 @@ the configuration (without a prefix: ``Auto``).
.. _BreakAfterAttributes:
**BreakAfterAttributes** (``AttributeBreakingStyle``) :versionbadge:`clang-format 16` :ref:`ΒΆ <BreakAfterAttributes>`
- Break after a group of C++11 attributes before a variable/function
- (including constructor/destructor) declaration/definition name.
+ Break after a group of C++11 attributes before a function
+ declaration/definition name.
Possible values:
@@ -2059,10 +2059,6 @@ the configuration (without a prefix: ``Auto``).
.. code-block:: c++
- [[maybe_unused]]
- const int i;
- [[gnu::const]] [[maybe_unused]]
- int j;
[[nodiscard]]
inline int f();
[[gnu::const]] [[nodiscard]]
@@ -2073,9 +2069,6 @@ the configuration (without a prefix: ``Auto``).
.. code-block:: c++
- [[maybe_unused]] const int i;
- [[gnu::const]] [[maybe_unused]]
- int j;
[[nodiscard]] inline int f();
[[gnu::const]] [[nodiscard]]
int g();
@@ -2085,8 +2078,6 @@ the configuration (without a prefix: ``Auto``).
.. code-block:: c++
- [[maybe_unused]] const int i;
- [[gnu::const]] [[maybe_unused]] int j;
[[nodiscard]] inline int f();
[[gnu::const]] [[nodiscard]] int g();
diff --git a/clang/include/clang/Format/Format.h b/clang/include/clang/Format/Format.h
index 9442344000e142b..3e9d1915badd87f 100644
--- a/clang/include/clang/Format/Format.h
+++ b/clang/include/clang/Format/Format.h
@@ -1428,10 +1428,6 @@ struct FormatStyle {
enum AttributeBreakingStyle : int8_t {
/// Always break after attributes.
/// \code
- /// [[maybe_unused]]
- /// const int i;
- /// [[gnu::const]] [[maybe_unused]]
- /// int j;
/// [[nodiscard]]
/// inline int f();
/// [[gnu::const]] [[nodiscard]]
@@ -1440,9 +1436,6 @@ struct FormatStyle {
ABS_Always,
/// Leave the line breaking after attributes as is.
/// \code
- /// [[maybe_unused]] const int i;
- /// [[gnu::const]] [[maybe_unused]]
- /// int j;
/// [[nodiscard]] inline int f();
/// [[gnu::const]] [[nodiscard]]
/// int g();
@@ -1450,16 +1443,14 @@ struct FormatStyle {
ABS_Leave,
/// Never break after attributes.
/// \code
- /// [[maybe_unused]] const int i;
- /// [[gnu::const]] [[maybe_unused]] int j;
/// [[nodiscard]] inline int f();
/// [[gnu::const]] [[nodiscard]] int g();
/// \endcode
ABS_Never,
};
- /// Break after a group of C++11 attributes before a variable/function
- /// (including constructor/destructor) declaration/definition name.
+ /// Break after a group of C++11 attributes before a function
+ /// declaration/definition name.
/// \version 16
AttributeBreakingStyle BreakAfterAttributes;
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp
index e06b4d5a3b05eef..729e7e370bf62ea 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -2000,10 +2000,6 @@ class AnnotatingParser {
(!Line.MightBeFunctionDecl || Current.NestingLevel != 0)) {
Contexts.back().FirstStartOfName = &Current;
Current.setType(TT_StartOfName);
- if (auto *PrevNonComment = Current.getPreviousNonComment();
- PrevNonComment && PrevNonComment->is(TT_StartOfName)) {
- PrevNonComment->setType(TT_Unknown);
- }
} else if (Current.is(tok::semi)) {
// Reset FirstStartOfName after finding a semicolon so that a for loop
// with multiple increment statements is not confused with a for loop
@@ -3262,7 +3258,7 @@ static bool isFunctionDeclarationName(bool IsCpp, const FormatToken &Current,
if (Current.is(TT_FunctionDeclarationName))
return true;
- if (!Current.Tok.getIdentifierInfo() || Current.is(TT_CtorDtorDeclName))
+ if (!Current.Tok.getIdentifierInfo())
return false;
auto skipOperatorName = [](const FormatToken *Next) -> const FormatToken * {
@@ -3445,30 +3441,29 @@ void TokenAnnotator::calculateFormattingInformation(AnnotatedLine &Line) const {
if (AlignArrayOfStructures)
calculateArrayInitializerColumnList(Line);
- const bool IsCpp = Style.isCpp();
bool LineIsFunctionDeclaration = false;
FormatToken *ClosingParen = nullptr;
for (FormatToken *Tok = Current, *AfterLastAttribute = nullptr; Tok;
Tok = Tok->Next) {
if (Tok->Previous->EndsCppAttributeGroup)
AfterLastAttribute = Tok;
- if (isFunctionDeclarationName(IsCpp, *Tok, Line, ClosingParen)) {
- LineIsFunctionDeclaration = true;
- Tok->setFinalizedType(TT_FunctionDeclarationName);
- }
- if (LineIsFunctionDeclaration ||
- Tok->isOneOf(TT_CtorDtorDeclName, TT_StartOfName)) {
- if (IsCpp && AfterLastAttribute &&
+ if (const bool IsCtorOrDtor = Tok->is(TT_CtorDtorDeclName);
+ IsCtorOrDtor ||
+ isFunctionDeclarationName(Style.isCpp(), *Tok, Line, ClosingParen)) {
+ if (!IsCtorOrDtor) {
+ LineIsFunctionDeclaration = true;
+ Tok->setFinalizedType(TT_FunctionDeclarationName);
+ }
+ if (AfterLastAttribute &&
mustBreakAfterAttributes(*AfterLastAttribute, Style)) {
AfterLastAttribute->MustBreakBefore = true;
- if (LineIsFunctionDeclaration)
- Line.ReturnTypeWrapped = true;
+ Line.ReturnTypeWrapped = true;
}
break;
}
}
- if (IsCpp) {
+ if (Style.isCpp()) {
if (!LineIsFunctionDeclaration) {
// Annotate */&/&& in `operator` function calls as binary operators.
for (const auto *Tok = Line.First; Tok; Tok = Tok->Next) {
diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp
index bb01f57dce31a7a..80903e7630c8073 100644
--- a/clang/unittests/Format/FormatTest.cpp
+++ b/clang/unittests/Format/FormatTest.cpp
@@ -8479,25 +8479,18 @@ TEST_F(FormatTest, BreaksFunctionDeclarationsWithTrailingTokens) {
" aaaaaaaaaaaaaaaaaaaaaaaaa));");
verifyFormat("bool aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
" __attribute__((unused));");
-
- Style = getGoogleStyle();
- Style.AttributeMacros.push_back("GUARDED_BY");
- verifyFormat(
+ verifyGoogleFormat(
"bool aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
- " GUARDED_BY(aaaaaaaaaaaa);",
- Style);
- verifyFormat(
+ " GUARDED_BY(aaaaaaaaaaaa);");
+ verifyGoogleFormat(
"bool aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
- " GUARDED_BY(aaaaaaaaaaaa);",
- Style);
- verifyFormat(
+ " GUARDED_BY(aaaaaaaaaaaa);");
+ verifyGoogleFormat(
"bool aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa GUARDED_BY(aaaaaaaaaaaa) =\n"
- " aaaaaaaa::aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;",
- Style);
- verifyFormat(
+ " aaaaaaaa::aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;");
+ verifyGoogleFormat(
"bool aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa GUARDED_BY(aaaaaaaaaaaa) =\n"
- " aaaaaaaaaaaaaaaaaaaaaaaaa;",
- Style);
+ " aaaaaaaaaaaaaaaaaaaaaaaaa;");
}
TEST_F(FormatTest, FunctionAnnotations) {
@@ -26199,10 +26192,9 @@ TEST_F(FormatTest, RemoveSemicolon) {
}
TEST_F(FormatTest, BreakAfterAttributes) {
- constexpr StringRef Code("[[maybe_unused]] const int i;\n"
- "[[foo([[]])]] [[maybe_unused]]\n"
- "int j;\n"
- "[[nodiscard]] inline int f(int &i);\n"
+ FormatStyle Style = getLLVMStyle();
+
+ constexpr StringRef Code("[[nodiscard]] inline int f(int &i);\n"
"[[foo([[]])]] [[nodiscard]]\n"
"int g(int &i);\n"
"[[nodiscard]]\n"
@@ -26215,14 +26207,11 @@ TEST_F(FormatTest, BreakAfterAttributes) {
" return 1;\n"
"}");
- FormatStyle Style = getLLVMStyle();
EXPECT_EQ(Style.BreakAfterAttributes, FormatStyle::ABS_Leave);
verifyNoChange(Code, Style);
Style.BreakAfterAttributes = FormatStyle::ABS_Never;
- verifyFormat("[[maybe_unused]] const int i;\n"
- "[[foo([[]])]] [[maybe_unused]] int j;\n"
- "[[nodiscard]] inline int f(int &i);\n"
+ verifyFormat("[[nodiscard]] inline int f(int &i);\n"
"[[foo([[]])]] [[nodiscard]] int g(int &i);\n"
"[[nodiscard]] inline int f(int &i) {\n"
" i = 1;\n"
@@ -26235,11 +26224,7 @@ TEST_F(FormatTest, BreakAfterAttributes) {
Code, Style);
Style.BreakAfterAttributes = FormatStyle::ABS_Always;
- verifyFormat("[[maybe_unused]]\n"
- "const int i;\n"
- "[[foo([[]])]] [[maybe_unused]]\n"
- "int j;\n"
- "[[nodiscard]]\n"
+ verifyFormat("[[nodiscard]]\n"
"inline int f(int &i);\n"
"[[foo([[]])]] [[nodiscard]]\n"
"int g(int &i);\n"
More information about the cfe-commits
mailing list