diff --git a/clang/lib/Format/UnwrappedLineParser.cpp b/clang/lib/Format/UnwrappedLineParser.cpp --- a/clang/lib/Format/UnwrappedLineParser.cpp +++ b/clang/lib/Format/UnwrappedLineParser.cpp @@ -1956,6 +1956,9 @@ nextToken(); if (FormatTok->Tok.is(tok::l_paren)) parseParens(); + // handle [[likely]] / [[unlikely]] + if (FormatTok->is(tok::l_square)) + parseSquare(); bool NeedsUnwrappedLine = false; if (FormatTok->Tok.is(tok::l_brace)) { CompoundStatementIndenter Indenter(this, Style, Line->Level); @@ -1972,6 +1975,9 @@ } if (FormatTok->Tok.is(tok::kw_else)) { nextToken(); + // handle [[likely]] / [[unlikely]] + if (FormatTok->is(tok::l_square)) + parseSquare(); if (FormatTok->Tok.is(tok::l_brace)) { CompoundStatementIndenter Indenter(this, Style, Line->Level); parseBlock(/*MustBeDeclaration=*/false); diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -16363,6 +16363,36 @@ Style)); } +TEST_F(FormatTest, LikelyUnlikely) { + FormatStyle Style = getLLVMStyle(); + + verifyFormat("if (argc > 5) [[unlikely]] {\n" + " return 29;\n" + "}", + Style); + + verifyFormat("if (argc > 5) [[likely]] {\n" + " return 29;\n" + "}", + Style); + + verifyFormat("if (argc > 5) [[unlikely]] {\n" + " return 29;\n" + "} else [[likely]] {\n" + " return 42;\n" + "}\n", + Style); + + verifyFormat("if (argc > 5) [[unlikely]] {\n" + " return 29;\n" + "} else if (argc > 10) [[likely]] {\n" + " return 99;\n" + "} else {\n" + " return 42;\n" + "}\n", + Style); +} + } // namespace } // namespace format } // namespace clang