[clang-format] Parse __attribute((foo)) as a pointer qualifier

[arichardson]

Summary

Before: void f() { MACRO(A * attribute((foo)) a); }
After: void f() { MACRO(A *attribute((foo)) a); }

Also check that the attribute alias is handled.

[aaron.ballman]

clang/lib/Format/TokenAnnotator.cpp

1895

What about other attributes than GNU-style ones, like [[clang::address_space(0)]]?

[arichardson]

clang/lib/Format/TokenAnnotator.cpp

1895

I guess those should also be handled. I can try to do that in a follow-up change.

[arichardson]

clang/lib/Format/TokenAnnotator.cpp

1895

It appears that they are already handled for this case. I've handled them in cast expressions in D86721.

[aaron.ballman]

clang/lib/Format/TokenAnnotator.cpp

1895

Ah, thank you for the update! Can you add a test case for that, as I don't see one in the current tests?

[arichardson]

clang/lib/Format/TokenAnnotator.cpp

1895

I added the test to D86721 since this change handles attribute and that one deals with [[attr]]

[MyDeveloperDay]

LGTM thank you for these updates

clang/lib/Format/TokenAnnotator.cpp

TokenType determineStarAmpUsage(const FormatToken &Tok, bool IsExpression,
     const FormatToken *PrevToken = Tok.getPreviousNonComment();
     if (!PrevToken)
       return TT_UnaryOperator;
 
     const FormatToken *NextToken = Tok.getNextNonComment();
     if (!NextToken ||
         NextToken->isOneOf(tok::arrow, tok::equal, tok::kw_const,
                            tok::kw_restrict, tok::kw_volatile,
-                           tok::kw_noexcept) ||
+                           tok::kw___attribute, tok::kw_noexcept) ||
         (NextToken->is(tok::l_brace) && !NextToken->getNextNonComment()))
       return TT_PointerOrReference;
 
     if (PrevToken->is(tok::coloncolon))
       return TT_PointerOrReference;
 
     if (PrevToken->isOneOf(tok::l_paren, tok::l_square, tok::l_brace,
                            tok::comma, tok::semi, tok::kw_return, tok::colon,

clang/unittests/Format/FormatTest.cpp

TEST_F(FormatTest, UnderstandsUsesOfStarAndAmp) {
   verifyIndependentOfContext("MACRO(const A *a);");
   verifyIndependentOfContext("MACRO(A *const a);");
   verifyIndependentOfContext("MACRO(A *restrict a);");
   verifyIndependentOfContext("MACRO(A *__restrict__ a);");
   verifyIndependentOfContext("MACRO(A *__restrict a);");
   verifyIndependentOfContext("MACRO(A *volatile a);");
   verifyIndependentOfContext("MACRO(A *__volatile a);");
   verifyIndependentOfContext("MACRO(A *__volatile__ a);");
+  verifyIndependentOfContext("MACRO(A *__attribute__((foo)) a);");
+  verifyIndependentOfContext("MACRO(A *__attribute((foo)) a);");
   verifyIndependentOfContext("MACRO('0' <= c && c <= '9');");
   verifyFormat("void f() { f(float{1}, a * a); }");
   // FIXME: Is there a way to make this work?
   // verifyIndependentOfContext("MACRO(A *a);");
 
   verifyFormat("DatumHandle const *operator->() const { return input_; }");
   verifyFormat("return options != nullptr && operator==(*options);");