Author: Owen Pan Date: 2025-04-22T21:07:31-07:00 New Revision: 4f71655b64a815143d2aedb22b8f423f7ce99e29
URL: https://github.com/llvm/llvm-project/commit/4f71655b64a815143d2aedb22b8f423f7ce99e29 DIFF: https://github.com/llvm/llvm-project/commit/4f71655b64a815143d2aedb22b8f423f7ce99e29.diff LOG: [clang-format] Fix a bug in parsing C-style cast of lambdas (#136099) Fix #135959 Added: Modified: clang/lib/Format/UnwrappedLineParser.cpp clang/unittests/Format/TokenAnnotatorTest.cpp Removed: ################################################################################ diff --git a/clang/lib/Format/UnwrappedLineParser.cpp b/clang/lib/Format/UnwrappedLineParser.cpp index b9430d4389feb..df58e5ef4d6a3 100644 --- a/clang/lib/Format/UnwrappedLineParser.cpp +++ b/clang/lib/Format/UnwrappedLineParser.cpp @@ -2368,13 +2368,25 @@ bool UnwrappedLineParser::tryToParseLambdaIntroducer() { const FormatToken *Previous = FormatTok->Previous; const FormatToken *LeftSquare = FormatTok; nextToken(); - if ((Previous && ((Previous->Tok.getIdentifierInfo() && - !Previous->isOneOf(tok::kw_return, tok::kw_co_await, - tok::kw_co_yield, tok::kw_co_return)) || - Previous->closesScope())) || - LeftSquare->isCppStructuredBinding(IsCpp)) { - return false; + if (Previous) { + if (Previous->Tok.getIdentifierInfo() && + !Previous->isOneOf(tok::kw_return, tok::kw_co_await, tok::kw_co_yield, + tok::kw_co_return)) { + return false; + } + if (Previous->closesScope()) { + // Not a potential C-style cast. + if (Previous->isNot(tok::r_paren)) + return false; + const auto *BeforeRParen = Previous->getPreviousNonComment(); + // Lambdas can be cast to function types only, e.g. `std::function<int()>` + // and `int (*)()`. + if (!BeforeRParen || !BeforeRParen->isOneOf(tok::greater, tok::r_paren)) + return false; + } } + if (LeftSquare->isCppStructuredBinding(IsCpp)) + return false; if (FormatTok->is(tok::l_square) || tok::isLiteral(FormatTok->Tok.getKind())) return false; if (FormatTok->is(tok::r_square)) { diff --git a/clang/unittests/Format/TokenAnnotatorTest.cpp b/clang/unittests/Format/TokenAnnotatorTest.cpp index a6410f3c8fe53..73858e87c832a 100644 --- a/clang/unittests/Format/TokenAnnotatorTest.cpp +++ b/clang/unittests/Format/TokenAnnotatorTest.cpp @@ -2165,6 +2165,16 @@ TEST_F(TokenAnnotatorTest, UnderstandsLambdas) { // FIXME: // EXPECT_TOKEN(Tokens[13], tok::l_paren, TT_LambdaDefinitionLParen); EXPECT_TOKEN(Tokens[17], tok::l_brace, TT_LambdaLBrace); + + Tokens = annotate("auto foo{(std::function<int()>)[] { return 0; }};"); + ASSERT_EQ(Tokens.size(), 23u) << Tokens; + EXPECT_TOKEN(Tokens[13], tok::l_square, TT_LambdaLSquare); + EXPECT_TOKEN(Tokens[15], tok::l_brace, TT_LambdaLBrace); + + Tokens = annotate("auto foo{(int (*)())[] { return 0; }};"); + ASSERT_EQ(Tokens.size(), 21u) << Tokens; + EXPECT_TOKEN(Tokens[11], tok::l_square, TT_LambdaLSquare); + EXPECT_TOKEN(Tokens[13], tok::l_brace, TT_LambdaLBrace); } TEST_F(TokenAnnotatorTest, UnderstandsFunctionAnnotations) { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
