llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang-format Author: None (rmarker) <details> <summary>Changes</summary> Fixes #<!-- -->125012 --- Full diff: https://github.com/llvm/llvm-project/pull/126019.diff 2 Files Affected: - (modified) clang/lib/Format/TokenAnnotator.cpp (+15-2) - (modified) clang/unittests/Format/TokenAnnotatorTest.cpp (+5) ``````````diff diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index f25332e3a5f4e1a..fc84f29dd04389b 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -2915,14 +2915,27 @@ class AnnotatingParser { if (Prev->is(tok::r_paren)) { if (Prev->is(TT_CastRParen)) return false; + + // Check for the second pair of parentheses. Prev = Prev->MatchingParen; if (!Prev) return false; + + // Now check for the first pair of parentheses. Prev = Prev->Previous; if (!Prev || Prev->isNot(tok::r_paren)) return false; - Prev = Prev->MatchingParen; - return Prev && Prev->is(TT_FunctionTypeLParen); + const auto* PrevMatchingParen = Prev->MatchingParen; + if (!PrevMatchingParen) + return false; + + // We can quickly tell it is a function pointer type if the paren is the + // right type. + if (PrevMatchingParen->isNot(TT_Unknown)) + return PrevMatchingParen->is(TT_FunctionTypeLParen); + + // Otherwise check for the trailing * in the parentheses. + return Prev->Previous && Prev->Previous->is(tok::star); } // Search for unexpected tokens. diff --git a/clang/unittests/Format/TokenAnnotatorTest.cpp b/clang/unittests/Format/TokenAnnotatorTest.cpp index 1b09c4570345622..5dcb9b94a5bb2f5 100644 --- a/clang/unittests/Format/TokenAnnotatorTest.cpp +++ b/clang/unittests/Format/TokenAnnotatorTest.cpp @@ -874,6 +874,11 @@ TEST_F(TokenAnnotatorTest, UnderstandsCasts) { EXPECT_TOKEN(Tokens[14], tok::r_paren, TT_CastRParen); EXPECT_TOKEN(Tokens[15], tok::amp, TT_UnaryOperator); + Tokens = annotate("func((foo(bar::*)(void))&a);"); + ASSERT_EQ(Tokens.size(), 18u) << Tokens; + EXPECT_TOKEN(Tokens[12], tok::r_paren, TT_CastRParen); + EXPECT_TOKEN(Tokens[13], tok::amp, TT_UnaryOperator); + auto Style = getLLVMStyle(); Style.TypeNames.push_back("Foo"); Tokens = annotate("#define FOO(bar) foo((Foo)&bar)", Style); `````````` </details> https://github.com/llvm/llvm-project/pull/126019 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
