This is an archive of the discontinued LLVM Phabricator instance.

Differential D126438

[clang-format] Fix an invalid code generation in RemoveBracesLLVM
ClosedPublic

Authored by owenpan on May 25 2022, 7:35 PM.

Details

Reviewers
curdeius
MyDeveloperDay
HazardyKnusperkeks
Commits
rG5221875a957d: [clang-format] Fix an invalid code generation in RemoveBracesLLVM
Summary

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

Diff Detail

Event Timeline

owenpan created this revision.May 25 2022, 7:35 PM
Herald added a project: Restricted Project. · View Herald TranscriptMay 25 2022, 7:35 PM
owenpan requested review of this revision.May 25 2022, 7:35 PM
Herald added a project: Restricted Project. · View Herald TranscriptMay 25 2022, 7:35 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B166398: Diff 432168.May 25 2022, 8:02 PM
curdeius accepted this revision.May 25 2022, 11:03 PM

LGTM. Good catch for this bug!

This revision is now accepted and ready to land.May 25 2022, 11:03 PM
This revision was landed with ongoing or failed builds.May 26 2022, 1:38 PM
Closed by commit rG5221875a957d: [clang-format] Fix an invalid code generation in RemoveBracesLLVM (authored by owenpan). · Explain Why
This revision was automatically updated to reflect the committed changes.
owenpan added a commit: rG5221875a957d: [clang-format] Fix an invalid code generation in RemoveBracesLLVM.

Revision Contents

PathSize
clang/
lib/
Format/
11 lines
unittests/
Format/
24 lines

Diff 432377

clang/lib/Format/UnwrappedLineParser.cpp

Show First 20 Lines • Show All 2,581 Lines • ▼ Show 20 Lines if (Style.RemoveBracesLLVM) {
Kind = IfStmtKind::IfElse; Kind = IfStmtKind::IfElse;
} }
nextToken(); nextToken();
handleAttributes(); handleAttributes();
if (FormatTok->is(tok::l_brace)) { if (FormatTok->is(tok::l_brace)) {
FormatTok->setFinalizedType(TT_ElseLBrace); FormatTok->setFinalizedType(TT_ElseLBrace);
ElseLeftBrace = FormatTok; ElseLeftBrace = FormatTok;
CompoundStatementIndenter Indenter(this, Style, Line->Level); CompoundStatementIndenter Indenter(this, Style, Line->Level);
if (parseBlock(/*MustBeDeclaration=*/false, /*AddLevels=*/1u, const IfStmtKind ElseBlockKind =
/*MunchSemi=*/true, parseBlock(/*MustBeDeclaration=*/false, /*AddLevels=*/1u,
KeepElseBraces) == IfStmtKind::IfOnly) { /*MunchSemi=*/true, KeepElseBraces);
Kind = IfStmtKind::IfElseIf; if ((ElseBlockKind == IfStmtKind::IfOnly ||
ElseBlockKind == IfStmtKind::IfElseIf) &&
FormatTok->is(tok::kw_else)) {
KeepElseBraces = true;
} }
addUnwrappedLine(); addUnwrappedLine();
} else if (FormatTok->is(tok::kw_if)) { } else if (FormatTok->is(tok::kw_if)) {
const FormatToken *Previous = Tokens->getPreviousToken(); const FormatToken *Previous = Tokens->getPreviousToken();
assert(Previous); assert(Previous);
const bool IsPrecededByComment = Previous->is(tok::comment); const bool IsPrecededByComment = Previous->is(tok::comment);
if (IsPrecededByComment) { if (IsPrecededByComment) {
addUnwrappedLine(); addUnwrappedLine();
▲ Show 20 Lines • Show All 1,673 Lines • Show Last 20 Lines

clang/unittests/Format/FormatTest.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 25,380 Lines • ▼ Show 20 Lines verifyFormat("if (a) {\n"
" e;\n" " e;\n"
" }\n" " }\n"
"} else {\n" "} else {\n"
" g;\n" " g;\n"
"}", "}",
Style); Style);
verifyFormat("if (a)\n" verifyFormat("if (a)\n"
" if (b)\n"
" c;\n"
" else {\n"
" if (d)\n"
" e;\n"
" }\n"
"else\n"
" f;",
Style);
verifyFormat("if (a)\n"
" if (b)\n"
" c;\n"
" else {\n"
" if (d)\n"
" e;\n"
" else if (f)\n"
" g;\n"
" }\n"
"else\n"
" h;",
Style);
verifyFormat("if (a)\n"
" b;\n" " b;\n"
"else if (c)\n" "else if (c)\n"
" while (d)\n" " while (d)\n"
" e;\n" " e;\n"
"// comment", "// comment",
"if (a)\n" "if (a)\n"
"{\n" "{\n"
" b;\n" " b;\n"
▲ Show 20 Lines • Show All 687 Lines • Show Last 20 Lines