Addressing some feedback

* Add note for `__ptrauth_restricted_intptr`
* Rename confusing parameter in set_landing_pad_as_ptr
* Rename __ptrauth_unwind_pacret_personality_disc to
  __ptrauth_unwind_pauthtest_personality_disc

Author: ojhunt

compiler-rt/lib/builtins/gcc_personality_v0.c

@@ -33,6 +33,9 @@ EXCEPTION_DISPOSITION _GCC_specific_handler(PEXCEPTION_RECORD, void *, PCONTEXT,
 #if __has_feature(ptrauth_calls)
 #include <ptrauth.h>
 
+// `__ptrauth_restricted_intptr` is a feature of apple clang that predates
+// support for direct application of `__ptrauth` to integer types. This
+// guard is necessary to support compilation with those compiler.
 #if __has_feature(ptrauth_restricted_intptr_qualifier)
 #define __ptrauth_gcc_personality_intptr(key, addressDiscriminated,            \
                                          discriminator)                        \

libcxxabi/src/cxa_personality.cpp

@@ -44,6 +44,9 @@
 #  define __ptrauth_scan_results_landingpad                                                                            \
     __ptrauth(__ptrauth_scan_results_landingpad_key, 1, __ptrauth_scan_results_landingpad_disc)
 
+// `__ptrauth_restricted_intptr` is a feature of apple clang that predates
+// support for direct application of `__ptrauth` to integer types. This
+// guard is necessary to support compilation with those compiler.
 #  if __has_extension(ptrauth_restricted_intptr_qualifier)
 #    define __ptrauth_scan_results_landingpad_intptr                                                                   \
       __ptrauth_restricted_intptr(__ptrauth_scan_results_landingpad_key, 1, __ptrauth_scan_results_landingpad_disc)
@@ -594,13 +597,13 @@ namespace {
 // __ptrauth_nop_cast cannot be used here as the authentication schemas include
 // address diversification.
 template <typename PtrType>
-void set_landing_pad_as_ptr(scan_results& results, const PtrType& out) {
+void set_landing_pad_as_ptr(scan_results& results, const PtrType& landingPad) {
   union {
     landing_pad_t* as_landing_pad;
     landing_pad_ptr_t* as_pointer;
   } u;
   u.as_landing_pad = &results.landingPad;
-  *u.as_pointer = out;
+  *u.as_pointer = landingPad;
 }
 
 static const landing_pad_ptr_t& get_landing_pad_as_ptr(const scan_results& results) {

libunwind/include/libunwind.h

@@ -47,6 +47,9 @@
 
   #include <ptrauth.h>
 
+  // `__ptrauth_restricted_intptr` is a feature of apple clang that predates
+  // support for direct application of `__ptrauth` to integer types. This
+  // guard is necessary to support compilation with those compiler.
   #if __has_extension(ptrauth_restricted_intptr_qualifier)
     #define __unwind_ptrauth_restricted_intptr(...) \
       __ptrauth_restricted_intptr(__VA_ARGS__)
@@ -55,7 +58,7 @@
       __ptrauth(__VA_ARGS__)
   #endif
 
-// ptrauth_string_discriminator("unw_proc_info_t::handler") == 0x7405
+  // ptrauth_string_discriminator("unw_proc_info_t::handler") == 0x7405
   #define __ptrauth_unwind_upi_handler_disc 0x7405
 
   #define __ptrauth_unwind_upi_handler \
@@ -65,62 +68,62 @@
     __unwind_ptrauth_restricted_intptr(ptrauth_key_function_pointer, 1,\
                                        __ptrauth_unwind_upi_handler_disc)
 
-// ptrauth_string_discriminator("unw_proc_info_t::start_ip") == 0xCA2C
+  // ptrauth_string_discriminator("unw_proc_info_t::start_ip") == 0xCA2C
   #define __ptrauth_unwind_upi_startip \
     __unwind_ptrauth_restricted_intptr(ptrauth_key_process_independent_code, 1, 0xCA2C)
 
-// ptrauth_string_discriminator("unw_proc_info_t::end_ip") == 0xE183
+  // ptrauth_string_discriminator("unw_proc_info_t::end_ip") == 0xE183
   #define __ptrauth_unwind_upi_endip \
     __unwind_ptrauth_restricted_intptr(ptrauth_key_process_independent_code, 1, 0xE183)
 
-// ptrauth_string_discriminator("unw_proc_info_t::lsda") == 0x83DE
+  // ptrauth_string_discriminator("unw_proc_info_t::lsda") == 0x83DE
   #define __ptrauth_unwind_upi_lsda \
     __unwind_ptrauth_restricted_intptr(ptrauth_key_process_dependent_data, 1, 0x83DE)
 
-// ptrauth_string_discriminator("unw_proc_info_t::flags") == 0x79A1
+  // ptrauth_string_discriminator("unw_proc_info_t::flags") == 0x79A1
   #define __ptrauth_unwind_upi_flags \
     __unwind_ptrauth_restricted_intptr(ptrauth_key_process_dependent_data, 1, 0x79A1)
 
-// ptrauth_string_discriminator("unw_proc_info_t::unwind_info") == 0xC20C
+  // ptrauth_string_discriminator("unw_proc_info_t::unwind_info") == 0xC20C
   #define __ptrauth_unwind_upi_info \
     __unwind_ptrauth_restricted_intptr(ptrauth_key_process_dependent_data, 1, 0xC20C)
 
-// ptrauth_string_discriminator("unw_proc_info_t::extra") == 0x03DF
+  // ptrauth_string_discriminator("unw_proc_info_t::extra") == 0x03DF
   #define __ptrauth_unwind_upi_extra \
     __unwind_ptrauth_restricted_intptr(ptrauth_key_process_dependent_data, 1, 0x03DF)
 
-// ptrauth_string_discriminator("Registers_arm64::link_reg_t") == 0x8301
+  // ptrauth_string_discriminator("Registers_arm64::link_reg_t") == 0x8301
   #define __ptrauth_unwind_registers_arm64_link_reg \
     __unwind_ptrauth_restricted_intptr(ptrauth_key_process_dependent_code, 1, 0x8301)
 
-// ptrauth_string_discriminator("UnwindInfoSections::dso_base") == 0x4FF5
+  // ptrauth_string_discriminator("UnwindInfoSections::dso_base") == 0x4FF5
   #define __ptrauth_unwind_uis_dso_base \
     __unwind_ptrauth_restricted_intptr(ptrauth_key_process_dependent_data, 1, 0x4FF5)
 
-// ptrauth_string_discriminator("UnwindInfoSections::dwarf_section") == 0x4974
+  // ptrauth_string_discriminator("UnwindInfoSections::dwarf_section") == 0x4974
   #define __ptrauth_unwind_uis_dwarf_section \
     __unwind_ptrauth_restricted_intptr(ptrauth_key_process_dependent_data, 1, 0x4974)
 
-// ptrauth_string_discriminator("UnwindInfoSections::dwarf_section_length") == 0x2A9A
+  // ptrauth_string_discriminator("UnwindInfoSections::dwarf_section_length") == 0x2A9A
   #define __ptrauth_unwind_uis_dwarf_section_length \
     __unwind_ptrauth_restricted_intptr(ptrauth_key_process_dependent_data, 1, 0x2A9A)
 
-// ptrauth_string_discriminator("UnwindInfoSections::compact_unwind_section") == 0xA27B
+  // ptrauth_string_discriminator("UnwindInfoSections::compact_unwind_section") == 0xA27B
   #define __ptrauth_unwind_uis_compact_unwind_section \
     __unwind_ptrauth_restricted_intptr(ptrauth_key_process_dependent_data, 1, 0xA27B)
 
-// ptrauth_string_discriminator("UnwindInfoSections::compact_unwind_section_length") == 0x5D0A
+  // ptrauth_string_discriminator("UnwindInfoSections::compact_unwind_section_length") == 0x5D0A
   #define __ptrauth_unwind_uis_compact_unwind_section_length \
     __unwind_ptrauth_restricted_intptr(ptrauth_key_process_dependent_data, 1, 0x5D0A)
 
-// ptrauth_string_discriminator("CIE_Info::personality") == 0x6A40
+  // ptrauth_string_discriminator("CIE_Info::personality") == 0x6A40
   #define __ptrauth_unwind_cie_info_personality_disc 0x6A40
   #define __ptrauth_unwind_cie_info_personality \
     __unwind_ptrauth_restricted_intptr(ptrauth_key_function_pointer, 1, \
                                        __ptrauth_unwind_cie_info_personality_disc)
 
-// ptrauth_string_discriminator("personality") == 0x7EAD)
-  #define __ptrauth_unwind_pacret_personality_disc 0x7EAD
+  // ptrauth_string_discriminator("personality") == 0x7EAD)
+  #define __ptrauth_unwind_pauthtest_personality_disc 0x7EAD
 
 #else
 

libunwind/src/DwarfParser.hpp

@@ -409,7 +409,7 @@ const char *CFI_Parser<A>::parseCIE(A &addressSpace, pint_t cie,
           const auto oldDiscriminator = resultAddr;
 #else
           const auto oldDiscriminator = ptrauth_blend_discriminator(
-              (void *)resultAddr, __ptrauth_unwind_pacret_personality_disc);
+              (void *)resultAddr, __ptrauth_unwind_pauthtest_personality_disc);
 #endif
           const auto discriminator = ptrauth_blend_discriminator(
               &cieInfo->personality,

libunwind/src/UnwindLevel1.c

@@ -607,7 +607,7 @@ _LIBUNWIND_EXPORT uintptr_t _Unwind_GetIP(struct _Unwind_Context *context) {
   unw_word_t result;
   __unw_get_reg(cursor, UNW_REG_IP, &result);
 
-#if defined(__arm64e__)
+#if defined(_LIBUNWIND_TARGET_AARCH64_AUTHENTICATED_UNWINDING)
   // If we are in an arm64e frame, then the PC should have been signed with the
   // sp
   {