Fix signing schemas?

Author: atrosinenko

libcxxabi/src/cxa_personality.cpp

@@ -605,7 +605,7 @@ set_registers(_Unwind_Exception* unwind_exception, _Unwind_Context* context,
   const auto existingDiscriminator = ptrauth_blend_discriminator(
       &results.landingPad, ptrauth_string_discriminator(_LIBCXXABI_PTRAUTH_SCANRESULT_LANDINGPAD_DISC));
   unw_word_t newIP =
-      (unw_word_t)ptrauth_auth_and_resign(*(void**)&results.landingPad, _LIBCXXABI_PTRAUTH_KEY, existingDiscriminator,
+      (unw_word_t)ptrauth_auth_and_resign(*(void**)&results.landingPad, ptrauth_key_process_dependent_data, existingDiscriminator,
                                           ptrauth_key_return_address, stack_pointer);
   _Unwind_SetIP(context, newIP);
 #else

libunwind/src/DwarfInstructions.hpp

@@ -305,7 +305,7 @@ int DwarfInstructions<A, R>::stepWithDwarf(A &addressSpace,
 
       isSignalFrame = cieInfo.isSignalFrame;
 
-#if defined(_LIBUNWIND_TARGET_AARCH64)
+#if 0 && defined(_LIBUNWIND_TARGET_AARCH64)
       // If the target is aarch64 then the return address may have been signed
       // using the v8.3 pointer authentication extensions. The original
       // return address needs to be authenticated before the return address is

libunwind/src/DwarfParser.hpp

@@ -409,11 +409,14 @@ const char *CFI_Parser<A>::parseCIE(A &addressSpace, pint_t cie,
           // schema. If we could guarantee the encoding of the personality we
           // could avoid this by simply giving resultAddr the correct ptrauth
           // schema and performing an assignment.
+          const auto oldDiscriminator = ptrauth_blend_discriminator(
+              (void*)resultAddr,
+              ptrauth_string_discriminator("personality"));
           const auto discriminator = ptrauth_blend_discriminator(
               &cieInfo->personality,
               ptrauth_string_discriminator("CIE_Info::personality"));
           void *signedPtr = ptrauth_auth_and_resign(
-              (void *)personality, ptrauth_key_function_pointer, resultAddr,
+              (void *)personality, ptrauth_key_function_pointer, oldDiscriminator,
               ptrauth_key_function_pointer, discriminator);
           personality = (pint_t)signedPtr;
         }

libunwind/src/Registers.hpp

@@ -2000,7 +2000,7 @@ inline bool Registers_arm64::validRegister(int regNum) const {
 
 inline uint64_t Registers_arm64::getRegister(int regNum) const {
   if (regNum == UNW_REG_IP || regNum == UNW_AARCH64_PC)
-    return _registers.__pc;
+    return getIP();
   if (regNum == UNW_REG_SP || regNum == UNW_AARCH64_SP)
     return _registers.__sp;
   if (regNum == UNW_AARCH64_RA_SIGN_STATE)
@@ -2016,7 +2016,7 @@ inline uint64_t Registers_arm64::getRegister(int regNum) const {
 
 inline void Registers_arm64::setRegister(int regNum, uint64_t value) {
   if (regNum == UNW_REG_IP || regNum == UNW_AARCH64_PC)
-    _registers.__pc = value;
+    setIP(value);
   else if (regNum == UNW_REG_SP || regNum == UNW_AARCH64_SP)
     _registers.__sp = value;
   else if (regNum == UNW_AARCH64_RA_SIGN_STATE)