diff --git a/clang/lib/Format/FormatToken.h b/clang/lib/Format/FormatToken.h
--- a/clang/lib/Format/FormatToken.h
+++ b/clang/lib/Format/FormatToken.h
@@ -442,7 +442,7 @@
bool canBePointerOrReferenceQualifier() const {
return isOneOf(tok::kw_const, tok::kw_restrict, tok::kw_volatile,
tok::kw___attribute, tok::kw__Nonnull, tok::kw__Nullable,
- tok::kw__Null_unspecified);
+ tok::kw__Null_unspecified, tok::kw___ptr32, tok::kw___ptr64);
}
/// Determine whether the token is a simple-type-specifier.
diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp
--- a/clang/unittests/Format/FormatTest.cpp
+++ b/clang/unittests/Format/FormatTest.cpp
@@ -8028,6 +8028,8 @@
verifyFormat("vector v;");
verifyFormat("vector v;");
verifyFormat("vector v;");
+ verifyFormat("vector v;");
+ verifyFormat("vector v;");
verifyFormat("vector v;");
verifyFormat("vector v;");
verifyFormat("foo();");
@@ -8069,6 +8071,8 @@
verifyIndependentOfContext("MACRO(A *__attribute__((foo)) a);");
verifyIndependentOfContext("MACRO(A *__attribute((foo)) a);");
verifyIndependentOfContext("MACRO(A *[[clang::attr]] a);");
+ verifyIndependentOfContext("MACRO(A *__ptr32 a);");
+ verifyIndependentOfContext("MACRO(A *__ptr64 a);");
verifyIndependentOfContext("MACRO('0' <= c && c <= '9');");
verifyFormat("void f() { f(float{1}, a * a); }");
// FIXME: Is there a way to make this work?
@@ -8139,6 +8143,8 @@
verifyFormat("x = (foo *_Null_unspecified)*v;");
verifyFormat("x = (foo *_Nonnull)*v;");
verifyFormat("x = (foo *[[clang::attr]])*v;");
+ verifyFormat("x = (foo *__ptr32)*v;");
+ verifyFormat("x = (foo *__ptr64)*v;");
// Check that we handle multiple trailing qualifiers and skip them all to
// determine that the expression is a cast to a pointer type.