Switch to Schema addSignedPointer API, remove the exploded version, and add more tests

Author: ojhunt

clang/include/clang/CodeGen/ConstantInitBuilder.h

@@ -206,9 +206,6 @@ class ConstantAggregateBuilderBase {
   void addSignedPointer(llvm::Constant *Pointer,
                         const PointerAuthSchema &Schema, GlobalDecl CalleeDecl,
                         QualType CalleeType);
-  void addSignedPointer(llvm::Constant *Pointer, unsigned Key,
-                        bool UseAddressDiscrimination,
-                        llvm::ConstantInt *OtherDiscriminator);
 
   /// Add a null pointer of a specific type.
   void addNullPointer(llvm::PointerType *ptrTy) {

clang/lib/CodeGen/CGObjCMac.cpp

@@ -7684,15 +7684,9 @@ CGObjCNonFragileABIMac::GetInterfaceEHType(const ObjCInterfaceDecl *ID,
 
   if (auto &Schema =
           CGM.getCodeGenOpts().PointerAuth.CXXTypeInfoVTablePointer) {
-    uint32_t discrimination = 0;
-    if (Schema.hasOtherDiscrimination()) {
-      assert(Schema.getOtherDiscrimination() ==
-             PointerAuthSchema::Discrimination::Constant);
-      discrimination = Schema.getConstantDiscrimination();
-    }
-    values.addSignedPointer(
-        VTablePtr, Schema.getKey(), Schema.isAddressDiscriminated(),
-        llvm::ConstantInt::get(CGM.IntPtrTy, discrimination));
+      assert(!Schema.hasOtherDiscrimination() ||
+             Schema.getOtherDiscrimination() == PointerAuthSchema::Discrimination::Constant);
+    values.addSignedPointer(VTablePtr, Schema, GlobalDecl(), QualType());
   } else {
     values.add(VTablePtr);
   }

clang/lib/CodeGen/ConstantInitBuilder.cpp

@@ -314,15 +314,3 @@ void ConstantAggregateBuilderBase::addSignedPointer(
       Pointer, Schema, StorageAddress, CalleeDecl, CalleeType);
   add(SignedPointer);
 }
-
-void ConstantAggregateBuilderBase::addSignedPointer(
-    llvm::Constant *Pointer, unsigned Key, bool UseAddressDiscrimination,
-    llvm::ConstantInt *OtherDiscriminator) {
-  llvm::Constant *StorageAddress = nullptr;
-  if (UseAddressDiscrimination)
-    StorageAddress = getAddrOfCurrentPosition(Pointer->getType());
-
-  llvm::Constant *SignedPointer = Builder.CGM.getConstantSignedPointer(
-      Pointer, Key, StorageAddress, OtherDiscriminator);
-  add(SignedPointer);
-}

clang/test/CodeGenObjC/ptrauth-attr-exception.m

@@ -1,4 +1,5 @@
-// RUN: %clang_cc1 -triple arm64-apple-ios -fptrauth-calls -emit-llvm -fexceptions -fobjc-exceptions -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple arm64-apple-ios                                                   -fptrauth-calls -emit-llvm -fexceptions -fobjc-exceptions -o - %s | FileCheck %s
+// RUN: %clang_cc1 -triple arm64-apple-ios -fptrauth-type-info-vtable-pointer-discrimination -fptrauth-calls -emit-llvm -fexceptions -fobjc-exceptions -o - %s | FileCheck --check-prefix=TYPEDISC_TYPEINFO %s
 
 __attribute__((objc_root_class))
 @interface Root {
@@ -13,4 +14,5 @@ @interface A : Root
 @implementation A
 @end
 
-// CHECK: @"OBJC_EHTYPE_$_A" = global {{%.*}} { ptr ptrauth (ptr getelementptr inbounds (ptr, ptr @objc_ehtype_vtable, i32 2), i32 2),
+            // CHECK: @"OBJC_EHTYPE_$_A" = global {{%.*}} { ptr ptrauth (ptr getelementptr inbounds (ptr, ptr @objc_ehtype_vtable, i32 2), i32 2),
+// TYPEDISC_TYPEINFO: @"OBJC_EHTYPE_$_A" = global {{%.*}} { ptr ptrauth (ptr getelementptr inbounds (ptr, ptr @objc_ehtype_vtable, i32 2), i32 2, i64 45546, ptr @"OBJC_EHTYPE_$_A"),