caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[clang-format] Respect ColumnLimit 0 line breaks in inline asm

Browse Source 
Previously, using ColumnLimit: 0 with extended inline asm with the
BreakBeforeInlineASMColon: OnlyMultiline option (the default style),
the formatter would act as if in Always mode, meaning a line break was
added before every colon in an extended inline assembly block.

This patch respects the already existing line breaks, and doesn't add
any new ones, if in ColumnLimit 0 mode.

Behaviour with Always stays as expected, with a break before every colon
regardless of any existing line breaks.

Behaviour with Never was broken before, and remains broken with this patch,
it is just never respected in ColumnLimit 0 mode.

Fixes https://github.com/llvm/llvm-project/issues/62754

Reviewed By: HazardyKnusperkeks, owenpan

Differential Revision: https://reviews.llvm.org/D150848
This commit is contained in:
Emilia Kond
2023-06-23 17:30:19 +03:00
parent ab94c1bad3
commit 7a38b3bfeb
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
clang/lib/Format/ContinuationIndenter.cpp
View File

@@ -357,7 +357,8 @@ bool ContinuationIndenter::mustBreak(const LineState &State) {
if (Current.MustBreakBefore ||
(Current.is(TT_InlineASMColon) &&
(Style.BreakBeforeInlineASMColon == FormatStyle::BBIAS_Always ||
Style.BreakBeforeInlineASMColon == FormatStyle::BBIAS_OnlyMultiline))) {
(Style.BreakBeforeInlineASMColon == FormatStyle::BBIAS_OnlyMultiline &&
Style.ColumnLimit > 0)))) {
return true;
}
if (CurrentState.BreakBeforeClosingBrace &&

18
clang/unittests/Format/FormatTest.cpp
View File

@@ -4612,6 +4612,24 @@ TEST_F(FormatTest, FormatsInlineASM) {
format("__asm {\n"
"}\n"
"int i;"));
auto Style = getLLVMStyleWithColumns(0);
const StringRef Code1{"asm(\"xyz\" : \"=a\"(a), \"=d\"(b) : \"a\"(data));"};
const StringRef Code2{"asm(\"xyz\"\n"
" : \"=a\"(a), \"=d\"(b)\n"
" : \"a\"(data));"};
const StringRef Code3{"asm(\"xyz\" : \"=a\"(a), \"=d\"(b)\n"
" : \"a\"(data));"};
Style.BreakBeforeInlineASMColon = FormatStyle::BBIAS_OnlyMultiline;
verifyFormat(Code1, Style);
EXPECT_EQ(Code2, format(Code2, Style));
EXPECT_EQ(Code3, format(Code3, Style));
Style.BreakBeforeInlineASMColon = FormatStyle::BBIAS_Always;
EXPECT_EQ(Code2, format(Code1, Style));
EXPECT_EQ(Code2, format(Code2, Style));
EXPECT_EQ(Code2, format(Code3, Style));
}
TEST_F(FormatTest, FormatTryCatch) {