[clang][NFC][PAC] Resolve some code drift from upstream pointer auth

clang/include/clang/Basic/Features.def

@@ -150,11 +150,6 @@ FEATURE(memory_sanitizer,
 FEATURE(type_sanitizer, LangOpts.Sanitize.has(SanitizerKind::Type))
 FEATURE(thread_sanitizer, LangOpts.Sanitize.has(SanitizerKind::Thread))
 FEATURE(dataflow_sanitizer, LangOpts.Sanitize.has(SanitizerKind::DataFlow))
-FEATURE(ptrauth_intrinsics, LangOpts.PointerAuthIntrinsics)
-FEATURE(ptrauth_qualifier, LangOpts.PointerAuthIntrinsics)
-FEATURE(ptrauth_calls, LangOpts.PointerAuthCalls)
-FEATURE(ptrauth_returns, LangOpts.PointerAuthReturns)
-FEATURE(ptrauth_indirect_gotos, LangOpts.PointerAuthIndirectGotos)
 FEATURE(scudo, LangOpts.Sanitize.hasOneOf(SanitizerKind::Scudo))
 FEATURE(ptrauth_intrinsics, LangOpts.PointerAuthIntrinsics &&
                             PP.getTargetInfo().getTriple().isOSDarwin())

clang/include/clang/CodeGen/CodeGenABITypes.h

@@ -120,6 +120,13 @@ llvm::Type *convertTypeForMemory(CodeGenModule &CGM, QualType T);
 unsigned getLLVMFieldNumber(CodeGenModule &CGM,
                             const RecordDecl *RD, const FieldDecl *FD);
 
+/// Return a declaration discriminator for the given global decl.
+uint16_t getPointerAuthDeclDiscriminator(CodeGenModule &CGM, GlobalDecl GD);
+
+/// Return a type discriminator for the given function type.
+uint16_t getPointerAuthTypeDiscriminator(CodeGenModule &CGM,
+                                         QualType FunctionType);
+
 /// Return a signed constant pointer.
 llvm::Constant *getConstantSignedPointer(CodeGenModule &CGM,
                                          llvm::Constant *Pointer, unsigned Key,

clang/lib/CodeGen/CGPointerAuth.cpp

@@ -53,6 +53,16 @@ llvm::ConstantInt *CodeGenModule::getPointerAuthOtherDiscriminator(
   llvm_unreachable("bad discrimination kind");
 }
 
+uint16_t CodeGen::getPointerAuthTypeDiscriminator(CodeGenModule &CGM,
+                                                  QualType FunctionType) {
+  return CGM.getContext().getPointerAuthTypeDiscriminator(FunctionType);
+}
+
+uint16_t CodeGen::getPointerAuthDeclDiscriminator(CodeGenModule &CGM,
+                                                  GlobalDecl Declaration) {
+  return CGM.getPointerAuthDeclDiscriminator(Declaration);
+}
+
 /// Return the "other" decl-specific discriminator for the given decl.
 uint16_t
 CodeGenModule::getPointerAuthDeclDiscriminator(GlobalDecl Declaration) {
@@ -87,6 +97,41 @@ CGPointerAuthInfo CodeGenModule::getFunctionPointerAuthInfo(QualType T) {
                            Discriminator);
 }
 
+llvm::Value *
+CodeGenFunction::EmitPointerAuthBlendDiscriminator(llvm::Value *StorageAddress,
+                                                   llvm::Value *Discriminator) {
+  StorageAddress = Builder.CreatePtrToInt(StorageAddress, IntPtrTy);
+  auto Intrinsic = CGM.getIntrinsic(llvm::Intrinsic::ptrauth_blend);
+  return Builder.CreateCall(Intrinsic, {StorageAddress, Discriminator});
+}
+
+/// Emit the concrete pointer authentication informaton for the
+/// given authentication schema.
+CGPointerAuthInfo CodeGenFunction::EmitPointerAuthInfo(
+    const PointerAuthSchema &Schema, llvm::Value *StorageAddress,
+    GlobalDecl SchemaDecl, QualType SchemaType) {
+  if (!Schema)
+    return CGPointerAuthInfo();
+
+  llvm::Value *Discriminator =
+      CGM.getPointerAuthOtherDiscriminator(Schema, SchemaDecl, SchemaType);
+
+  if (Schema.isAddressDiscriminated()) {
+    assert(StorageAddress &&
+           "address not provided for address-discriminated schema");
+
+    if (Discriminator)
+      Discriminator =
+          EmitPointerAuthBlendDiscriminator(StorageAddress, Discriminator);
+    else
+      Discriminator = Builder.CreatePtrToInt(StorageAddress, IntPtrTy);
+  }
+
+  return CGPointerAuthInfo(Schema.getKey(), Schema.getAuthenticationMode(),
+                           Schema.isIsaPointer(),
+                           Schema.authenticatesNullValues(), Discriminator);
+}
+
 CGPointerAuthInfo
 CodeGenFunction::EmitPointerAuthInfo(PointerAuthQualifier Qual,
                                      Address StorageAddress) {
@@ -447,41 +492,6 @@ buildConstantSignedPointer(CodeGenModule &CGM,
   return global;
 }
 
-llvm::Value *
-CodeGenFunction::EmitPointerAuthBlendDiscriminator(llvm::Value *StorageAddress,
-                                                   llvm::Value *Discriminator) {
-  StorageAddress = Builder.CreatePtrToInt(StorageAddress, IntPtrTy);
-  auto Intrinsic = CGM.getIntrinsic(llvm::Intrinsic::ptrauth_blend);
-  return Builder.CreateCall(Intrinsic, {StorageAddress, Discriminator});
-}
-
-/// Emit the concrete pointer authentication informaton for the
-/// given authentication schema.
-CGPointerAuthInfo CodeGenFunction::EmitPointerAuthInfo(
-    const PointerAuthSchema &Schema, llvm::Value *StorageAddress,
-    GlobalDecl SchemaDecl, QualType SchemaType) {
-  if (!Schema)
-    return CGPointerAuthInfo();
-
-  llvm::Value *Discriminator =
-      CGM.getPointerAuthOtherDiscriminator(Schema, SchemaDecl, SchemaType);
-
-  if (Schema.isAddressDiscriminated()) {
-    assert(StorageAddress &&
-           "address not provided for address-discriminated schema");
-
-    if (Discriminator)
-      Discriminator =
-          EmitPointerAuthBlendDiscriminator(StorageAddress, Discriminator);
-    else
-      Discriminator = Builder.CreatePtrToInt(StorageAddress, IntPtrTy);
-  }
-
-  return CGPointerAuthInfo(Schema.getKey(), Schema.getAuthenticationMode(),
-                           Schema.isIsaPointer(),
-                           Schema.authenticatesNullValues(), Discriminator);
-}
-
 void CodeGenFunction::EmitPointerAuthCopy(PointerAuthQualifier Qual, QualType T,
                                           Address DestAddress,
                                           Address SrcAddress) {

clang/lib/Driver/ToolChains/Darwin.cpp

@@ -3452,6 +3452,10 @@ void Darwin::addClangTargetOptions(
   if (!sdkSupportsBuiltinModules(SDKInfo))
     CC1Args.push_back("-fbuiltin-headers-in-system-modules");
 
+  if (!DriverArgs.hasArgNoClaim(options::OPT_fdefine_target_os_macros,
+                                options::OPT_fno_define_target_os_macros))
+    CC1Args.push_back("-fdefine-target-os-macros");
+
   // Disable subdirectory modulemap search on sufficiently recent SDKs.
   if (SDKInfo &&
       !DriverArgs.hasFlag(options::OPT_fmodulemap_allow_subdirectory_search,
@@ -3480,10 +3484,6 @@ void Darwin::addClangTargetOptions(
     if (!RequiresSubdirectorySearch)
       CC1Args.push_back("-fno-modulemap-allow-subdirectory-search");
   }
-
-  if (!DriverArgs.hasArgNoClaim(options::OPT_fdefine_target_os_macros,
-                                options::OPT_fno_define_target_os_macros))
-    CC1Args.push_back("-fdefine-target-os-macros");
 }
 
 void Darwin::addClangCC1ASTargetOptions(