[Format] Fix incorrect pointer detection

[Nuullll]

Summary

https://llvm.org/PR50429

Before:

void f() { f(float(1), a *a); }

After:

void f() { f(float(1), a * a); }

Signed-off-by: Yilong Guo <[e-mail]>

[curdeius]

Thanks for looking into this, but please add a test case that demonstrates the bug to FormatTests.cpp
Also, is there, by any chance, an associated bugzilla ticket?

[Nuullll]

Add test.

[Nuullll]

In D103589#2795447, @curdeius wrote:

Thanks for looking into this, but please add a test case that demonstrates the bug to FormatTests.cpp
Also, is there, by any chance, an associated bugzilla ticket?

Thanks for the comment.
I've added a test and linked to the bugzilla ticket in summary.

[HazardyKnusperkeks]

Seems reasonable. :)

[curdeius]

LGTM. Thanks for fixing this!
Do you have commit rights or you need somebody to land it for you?

[Nuullll]

In D103589#2796032, @curdeius wrote:

LGTM. Thanks for fixing this!
Do you have commit rights or you need somebody to land it for you?

I don't have commit access. I'd appreciate it if you or someone else could land this patch for me :)

clang/lib/Format/TokenAnnotator.cpp

while (CurrentToken) {
       if (CurrentToken->is(tok::l_brace))
         Left->setType(TT_Unknown); // Not TT_ObjCBlockLParen
       if (CurrentToken->is(tok::comma) && CurrentToken->Next &&
           !CurrentToken->Next->HasUnescapedNewline &&
           !CurrentToken->Next->isTrailingComment())
         HasMultipleParametersOnALine = true;
       if ((CurrentToken->Previous->isOneOf(tok::kw_const, tok::kw_auto) ||
            CurrentToken->Previous->isSimpleTypeSpecifier()) &&
-          !CurrentToken->is(tok::l_brace))
+          !CurrentToken->isOneOf(tok::l_brace, tok::l_paren))
         Contexts.back().IsExpression = false;
       if (CurrentToken->isOneOf(tok::semi, tok::colon)) {
         MightBeObjCForRangeLoop = false;
         if (PossibleObjCForInToken) {
           PossibleObjCForInToken->setType(TT_Unknown);
           PossibleObjCForInToken = nullptr;
         }
       }

clang/unittests/Format/FormatTest.cpp

TEST_F(FormatTest, UnderstandsUsesOfStarAndAmp) {
   verifyFormat("MACRO(A *__my_qualifier);", CustomQualifier);
   verifyFormat("void f() { MACRO(A *__my_qualifier); }", CustomQualifier);
   // Also check that TypenameMacros prevents parsing it as multiplication:
   verifyIndependentOfContext("MACRO(LIST(uint64_t) * a);"); // multiplication
   verifyIndependentOfContext("MACRO(LIST(uint64_t) *a);", TypeMacros); // type
 
   verifyIndependentOfContext("MACRO('0' <= c && c <= '9');");
   verifyFormat("void f() { f(float{1}, a * a); }");
+  verifyFormat("void f() { f(float(1), a * a); }");
   // FIXME: Is there a way to make this work?
   // verifyIndependentOfContext("MACRO(A *a);");
   verifyFormat("MACRO(A &B);");
   verifyFormat("MACRO(A *B);");
   verifyFormat("void f() { MACRO(A * B); }");
   verifyFormat("void f() { MACRO(A & B); }");
 
   // This lambda was mis-formatted after D88956 (treating it as a binop):