From 70aafbc4717264205796fa2ea67d78482f9f2a0d Mon Sep 17 00:00:00 2001 From: Owen Pan Date: Mon, 11 Sep 2023 01:00:24 -0700 Subject: [PATCH] [clang-format] Fix a bug in annotating `&&` followed by `*` or `&` Fixes #65877. --- clang/lib/Format/TokenAnnotator.cpp | 7 +++++-- clang/unittests/Format/TokenAnnotatorTest.cpp | 6 ++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index e925bee44cd0c6..142168e074bbc2 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -2598,9 +2598,12 @@ class AnnotatingParser { if (InTemplateArgument && NextToken->Tok.isAnyIdentifier()) return TT_BinaryOperator; - // "&&(" is quite unlikely to be two successive unary "&". - if (Tok.is(tok::ampamp) && NextToken->is(tok::l_paren)) + // "&&" followed by "(", "*", or "&" is quite unlikely to be two successive + // unary "&". + if (Tok.is(tok::ampamp) && + NextToken->isOneOf(tok::l_paren, tok::star, tok::amp)) { return TT_BinaryOperator; + } // This catches some cases where evaluation order is used as control flow: // aaa && aaa->f(); diff --git a/clang/unittests/Format/TokenAnnotatorTest.cpp b/clang/unittests/Format/TokenAnnotatorTest.cpp index 43485298371294..be025dab86fafa 100644 --- a/clang/unittests/Format/TokenAnnotatorTest.cpp +++ b/clang/unittests/Format/TokenAnnotatorTest.cpp @@ -280,6 +280,12 @@ TEST_F(TokenAnnotatorTest, UnderstandsUsesOfStarAndAmp) { EXPECT_TOKEN(Tokens[12], tok::ampamp, TT_BinaryOperator); EXPECT_TOKEN(Tokens[27], tok::ampamp, TT_BinaryOperator); + Tokens = annotate("foo = *i < *j && *j > *k;"); + EXPECT_EQ(Tokens.size(), 15u) << Tokens; + EXPECT_TOKEN(Tokens[4], tok::less, TT_BinaryOperator); + EXPECT_TOKEN(Tokens[7], tok::ampamp, TT_BinaryOperator); + EXPECT_TOKEN(Tokens[10], tok::greater, TT_BinaryOperator); + FormatStyle Style = getLLVMStyle(); Style.TypeNames.push_back("MYI"); Tokens = annotate("if (MYI *p{nullptr})", Style);