From b3b68c0f802ebd9892f66bec0e7be96b3fb06e86 Mon Sep 17 00:00:00 2001 From: Sam McCall Date: Fri, 24 Jan 2020 10:12:25 +0100 Subject: [PATCH] [Format] Fix 'auto x(T&&, T &&)->F' with PAS_Left. Summary: An heuristic targetting `x && x->foo` was targed overly broadly and caused the last T&& to be treated as a binary operator. Reviewers: hokein Subscribers: cfe-commits Tags: #clang Differential Revision: https://reviews.llvm.org/D73334 --- clang/lib/Format/TokenAnnotator.cpp | 10 ++++++---- clang/unittests/Format/FormatTest.cpp | 3 +++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 05b1db2a878..723dc5c7ba8 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -1801,14 +1801,16 @@ private: return TT_BinaryOperator; // "&&(" is quite unlikely to be two successive unary "&". - if (Tok.is(tok::ampamp) && NextToken && NextToken->is(tok::l_paren)) + if (Tok.is(tok::ampamp) && NextToken->is(tok::l_paren)) return TT_BinaryOperator; // This catches some cases where evaluation order is used as control flow: // aaa && aaa->f(); - const FormatToken *NextNextToken = NextToken->getNextNonComment(); - if (NextNextToken && NextNextToken->is(tok::arrow)) - return TT_BinaryOperator; + if (NextToken->Tok.isAnyIdentifier()) { + const FormatToken *NextNextToken = NextToken->getNextNonComment(); + if (NextNextToken && NextNextToken->is(tok::arrow)) + return TT_BinaryOperator; + } // It is very unlikely that we are going to find a pointer or reference type // definition on the RHS of an assignment. diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index 53d543728fb..cf8bb2c52f3 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -7407,6 +7407,9 @@ TEST_F(FormatTest, UnderstandsUsesOfStarAndAmp) { verifyFormat("typedef typeof(int(int, int))* MyFuncPtr;", Left); verifyFormat("[](const decltype(*a)* ptr) {}", Left); verifyFormat("typedef typeof /*comment*/ (int(int, int))* MyFuncPtr;", Left); + verifyFormat("auto x(A&&, B&&, C&&) -> D;", Left); + verifyFormat("auto x = [](A&&, B&&, C&&) -> D {};", Left); + verifyFormat("template X(T&&, T&&, T&&) -> X;", Left); verifyIndependentOfContext("a = *(x + y);"); verifyIndependentOfContext("a = &(x + y);");