Remove __ptrauth_restricted_intptr from docs and diagnostic message

Author: ahatanak

clang/include/clang/Basic/AttrDocs.td

@@ -2128,7 +2128,7 @@ Also see the documentation for `@available
 
 def PtrAuthDocs : Documentation {
   let Category = DocCatVariable;
-  let Heading = "__ptrauth, __ptrauth_restricted_intptr";
+  let Heading = "__ptrauth";
   let Content = [{
 The ``__ptrauth`` qualifier allows the programmer to directly control
 how pointers are signed when they are stored in a particular variable.

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -976,7 +976,7 @@ def err_ptrauth_indirect_goto_addrlabel_arithmetic : Error<
 
 // __ptrauth qualifier
 def err_ptrauth_qualifier_invalid : Error<
-  "%select{return types|parameter types|properties}2 may not be qualified with %select{__ptrauth|__ptrauth_restricted_intptr}1; type is %0">;
+  "%select{return types|parameter types|properties}1 may not be qualified with __ptrauth; type is %0">;
 def err_ptrauth_qualifier_cast : Error<
   "cast types may not be qualified with __ptrauth; type is %0">;
 def err_ptrauth_qualifier_nonpointer : Error<

clang/lib/Sema/SemaDecl.cpp

@@ -15268,8 +15268,7 @@ ParmVarDecl *Sema::CheckParameter(DeclContext *DC, SourceLocation StartLoc,
 
   // __ptrauth is forbidden on parameters.
   if (T.getPointerAuth()) {
-    Diag(NameLoc, diag::err_ptrauth_qualifier_invalid)
-        << T << (int)!T->isSignableType() << 1;
+    Diag(NameLoc, diag::err_ptrauth_qualifier_invalid) << T << 1;
     New->setInvalidDecl();
   }
 

clang/lib/Sema/SemaObjCProperty.cpp

@@ -181,8 +181,7 @@ Decl *SemaObjC::ActOnProperty(Scope *S, SourceLocation AtLoc,
   TypeSourceInfo *TSI = SemaRef.GetTypeForDeclarator(FD.D);
   QualType T = TSI->getType();
   if (T.getPointerAuth().isPresent()) {
-    Diag(AtLoc, diag::err_ptrauth_qualifier_invalid)
-        << T << (int)!T->isSignableType() << 2;
+    Diag(AtLoc, diag::err_ptrauth_qualifier_invalid) << T << 2;
   }
   if (!getOwnershipRule(Attributes)) {
     Attributes |= deducePropertyOwnershipFromType(SemaRef, T);

clang/lib/Sema/SemaType.cpp

@@ -2550,8 +2550,7 @@ bool Sema::CheckFunctionReturnType(QualType T, SourceLocation Loc) {
 
   // __ptrauth is illegal on a function return type.
   if (T.getPointerAuth()) {
-    Diag(Loc, diag::err_ptrauth_qualifier_invalid)
-        << T << (int)!T->isSignableType() << 0;
+    Diag(Loc, diag::err_ptrauth_qualifier_invalid) << T << 0;
     return true;
   }
 
@@ -2662,8 +2661,7 @@ QualType Sema::BuildFunctionType(QualType T,
       Invalid = true;
     } else if (ParamType.getPointerAuth()) {
       // __ptrauth is illegal on a function return type.
-      Diag(Loc, diag::err_ptrauth_qualifier_invalid)
-          << T << (int)!T->isSignableType() << 1;
+      Diag(Loc, diag::err_ptrauth_qualifier_invalid) << T << 1;
       Invalid = true;
     }
 
@@ -4977,8 +4975,7 @@ static TypeSourceInfo *GetFullTypeForDeclarator(TypeProcessingState &state,
 
       // __ptrauth is illegal on a function return type.
       if (T.getPointerAuth()) {
-        S.Diag(DeclType.Loc, diag::err_ptrauth_qualifier_invalid)
-            << T << (int)!T->isSignableType() << 0;
+        S.Diag(DeclType.Loc, diag::err_ptrauth_qualifier_invalid) << T << 0;
       }
 
       if (LangOpts.OpenCL) {