Use XXX_PTRAUTH_CALLS_AND_RETURNS macro instead of feature checks

Author: kovdan01

compiler-rt/lib/builtins/gcc_personality_v0.c

@@ -30,7 +30,9 @@ EXCEPTION_DISPOSITION _GCC_specific_handler(PEXCEPTION_RECORD, void *, PCONTEXT,
                                             _Unwind_Personality_Fn);
 #endif
 
-#if __has_feature(ptrauth_calls)
+#if __has_feature(ptrauth_calls) && __has_feature(ptrauth_returns)
+#define COMPILERRT_PTRAUTH_CALLS_AND_RETURNS
+
 #include <ptrauth.h>
 
 #if __has_feature(ptrauth_restricted_intptr_qualifier)
@@ -42,6 +44,8 @@ EXCEPTION_DISPOSITION _GCC_specific_handler(PEXCEPTION_RECORD, void *, PCONTEXT,
                                          discriminator)                        \
   __ptrauth(key, addressDiscriminated, discriminator)
 #endif
+#elif __has_feature(ptrauth_calls) || __has_feature(ptrauth_returns)
+#error "Either both or none of ptrauth_calls and ptrauth_returns is allowed to be enabled"
 #else
 #define __ptrauth_gcc_personality_intptr(...)
 #endif
@@ -289,7 +293,7 @@ COMPILER_RT_ABI _Unwind_Reason_Code __gcc_personality_v0(
       _Unwind_SetGR(context, __builtin_eh_return_data_regno(1), 0);
       size_t __ptrauth_gcc_personality_lpad landingPad =
           funcStart + landingPadOffset;
-#if __has_feature(ptrauth_calls)
+#ifdef COMPILERRT_PTRAUTH_CALLS_AND_RETURNS
       uintptr_t stackPointer = _Unwind_GetGR(context, -2);
       const uintptr_t existingDiscriminator = ptrauth_blend_discriminator(
           &landingPad, __ptrauth_gcc_personality_lpad_disc);

libcxxabi/include/__cxxabi_config.h

@@ -103,11 +103,14 @@
 #define _LIBCXXABI_DTOR_FUNC
 #endif
 
-#if __has_include(<ptrauth.h>)
-#  include <ptrauth.h>
+#if __has_feature(ptrauth_calls) && __has_feature(ptrauth_returns)
+#define LIBCXXABI_PTRAUTH_CALLS_AND_RETURNS
+#elif __has_feature(ptrauth_calls) || __has_feature(ptrauth_returns)
+#error "Either both or none of ptrauth_calls and ptrauth_returns is allowed to be enabled"
 #endif
 
-#if __has_feature(ptrauth_calls)
+#ifdef LIBCXXABI_PTRAUTH_CALLS_AND_RETURNS
+#  include <ptrauth.h>
 
 // ptrauth_string_discriminator("__cxa_exception::actionRecord") == 0xFC91
 #  define __ptrauth_cxxabi_action_record __ptrauth(ptrauth_key_process_dependent_data, 1, 0xFC91)

libcxxabi/src/cxa_personality.cpp

@@ -21,7 +21,7 @@
 #include "cxa_handlers.h"
 #include "private_typeinfo.h"
 
-#if __has_feature(ptrauth_calls)
+#ifdef LIBCXXABI_PTRAUTH_CALLS_AND_RETURNS
 
 // CXXABI depends on defintions in libunwind as pointer auth couples the
 // definitions
@@ -625,7 +625,7 @@ set_registers(_Unwind_Exception* unwind_exception, _Unwind_Context* context,
                 reinterpret_cast<uintptr_t>(unwind_exception));
   _Unwind_SetGR(context, __builtin_eh_return_data_regno(1),
                 static_cast<uintptr_t>(results.ttypeIndex));
-#if __has_feature(ptrauth_calls)
+#ifdef LIBCXXABI_PTRAUTH_CALLS_AND_RETURNS
   auto stackPointer = _Unwind_GetGR(context, UNW_REG_SP);
   // We manually re-sign the IP as the __ptrauth qualifiers cannot
   // express the required relationship with the destination address

libunwind/include/libunwind.h

@@ -43,7 +43,13 @@
   #define LIBUNWIND_AVAIL
 #endif
 
-#if __has_feature(ptrauth_calls)
+#if __has_feature(ptrauth_calls) && __has_feature(ptrauth_returns)
+#define LIBUNWIND_PTRAUTH_CALLS_AND_RETURNS
+#elif __has_feature(ptrauth_calls) || __has_feature(ptrauth_returns)
+#error "Either both or none of ptrauth_calls and ptrauth_returns is allowed to be enabled"
+#endif
+
+#ifdef LIBUNWIND_PTRAUTH_CALLS_AND_RETURNS
 
   #include <ptrauth.h>
 

libunwind/src/DwarfParser.hpp

@@ -398,7 +398,7 @@ const char *CFI_Parser<A>::parseCIE(A &addressSpace, pint_t cie,
         pint_t personality = addressSpace.getEncodedP(
             p, cieContentEnd, cieInfo->personalityEncoding,
             /*datarelBase=*/0, &resultAddr);
-#if __has_feature(ptrauth_calls)
+#ifdef LIBUNWIND_PTRAUTH_CALLS_AND_RETURNS
         if (personality) {
           // The GOT for the personality function was signed address
           // authenticated. Manually re-sign with the CIE_Info::personality

libunwind/src/Registers.hpp

@@ -1865,7 +1865,7 @@ class _LIBUNWIND_HIDDEN Registers_arm64 {
   void      setSP(uint64_t value) { _registers.__sp = value; }
   uint64_t  getIP() const         {
     uint64_t value = _registers.__pc;
-#if __has_feature(ptrauth_calls)
+#ifdef LIBUNWIND_PTRAUTH_CALLS_AND_RETURNS
     // Note the value of the PC was signed to its address in the register state
     // but everyone else expects it to be sign by the SP, so convert on return.
     value = (uint64_t)ptrauth_auth_and_resign((void *)_registers.__pc,
@@ -1877,7 +1877,7 @@ class _LIBUNWIND_HIDDEN Registers_arm64 {
     return value;
   }
   void      setIP(uint64_t value) {
-#if __has_feature(ptrauth_calls)
+#ifdef LIBUNWIND_PTRAUTH_CALLS_AND_RETURNS
     // Note the value which was set should have been signed with the SP.
     // We then resign with the slot we are being stored in to so that both SP
     // and LR can't be spoofed at the same time.
@@ -1892,7 +1892,7 @@ class _LIBUNWIND_HIDDEN Registers_arm64 {
   uint64_t getFP() const { return _registers.__fp; }
   void setFP(uint64_t value) { _registers.__fp = value; }
 
-#if __has_feature(ptrauth_calls)
+#ifdef LIBUNWIND_PTRAUTH_CALLS_AND_RETURNS
   void
   loadAndAuthenticateLinkRegister(reg_t inplaceAuthedLinkRegister,
                                   link_reg_t *referenceAuthedLinkRegister) {
@@ -1944,7 +1944,7 @@ inline Registers_arm64::Registers_arm64(const void *registers) {
   memcpy(_vectorHalfRegisters,
          static_cast<const uint8_t *>(registers) + sizeof(GPRs),
          sizeof(_vectorHalfRegisters));
-#if __has_feature(ptrauth_calls)
+#ifdef LIBUNWIND_PTRAUTH_CALLS_AND_RETURNS
   // We have to do some pointer authentication fixups after this copy,
   // and as part of that we need to load the source pc without
   // authenticating so that we maintain the signature for the resigning
@@ -1964,7 +1964,7 @@ inline Registers_arm64& Registers_arm64::operator=(const Registers_arm64& other)
   memcpy(&_registers, &other._registers, sizeof(_registers));
   memcpy(_vectorHalfRegisters, &other._vectorHalfRegisters,
          sizeof(_vectorHalfRegisters));
-#if __has_feature(ptrauth_calls)
+#ifdef LIBUNWIND_PTRAUTH_CALLS_AND_RETURNS
   // We perform this step to ensure that we correctly authenticate and re-sign
   // the pc after the bitwise copy.
   setIP(other.getIP());

libunwind/src/UnwindCursor.hpp

@@ -1051,7 +1051,7 @@ class UnwindCursor : public AbstractUnwindCursor{
                                const UnwindInfoSections &sects,
                                uint32_t fdeSectionOffsetHint = 0);
   int stepWithDwarfFDE(bool stage2) {
-#if __has_feature(ptrauth_calls)
+#ifdef LIBUNWIND_PTRAUTH_CALLS_AND_RETURNS
     typename R::reg_t rawPC = this->getReg(UNW_REG_IP);
     typename R::link_reg_t pc;
     _registers.loadAndAuthenticateLinkRegister(rawPC, &pc);
@@ -1995,7 +1995,7 @@ bool UnwindCursor<A, R>::getInfoFromCompactEncodingSection(
         personalityIndex * sizeof(uint32_t));
     pint_t personalityPointer = sects.dso_base + (pint_t)personalityDelta;
     personality = _addressSpace.getP(personalityPointer);
-#if __has_feature(ptrauth_calls)
+#ifdef LIBUNWIND_PTRAUTH_CALLS_AND_RETURNS
     // The GOT for the personality function was signed address authenticated.
     // Resign it as a regular function pointer.
     const auto discriminator =
@@ -2682,7 +2682,7 @@ void UnwindCursor<A, R>::setInfoBasedOnIPRegister(bool isReturnAddress) {
 #endif
 
   typename R::link_reg_t pc;
-#if __has_feature(ptrauth_calls)
+#ifdef LIBUNWIND_PTRAUTH_CALLS_AND_RETURNS
   _registers.loadAndAuthenticateLinkRegister(rawPC, &pc);
 #else
   pc = rawPC;
@@ -3237,7 +3237,7 @@ void UnwindCursor<A, R>::getInfo(unw_proc_info_t *info) {
 template <typename A, typename R>
 bool UnwindCursor<A, R>::getFunctionName(char *buf, size_t bufLen,
                                          unw_word_t *offset) {
-#if __has_feature(ptrauth_calls)
+#ifdef LIBUNWIND_PTRAUTH_CALLS_AND_RETURNS
   typename R::reg_t rawPC = this->getReg(UNW_REG_IP);
   typename R::link_reg_t pc;
   _registers.loadAndAuthenticateLinkRegister(rawPC, &pc);

libunwind/src/UnwindLevel1.c

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

libunwind/src/UnwindRegistersRestore.S

@@ -685,7 +685,7 @@ DEFINE_LIBUNWIND_FUNCTION(__libunwind_Registers_arm64_jumpto)
   ldr    x16,     [x0, #0x0F8]  // load sp into scratch
   ldr    lr,      [x0, #0x100]  // restore pc into lr
 
-#if __has_feature(ptrauth_calls)
+#ifdef LIBUNWIND_PTRAUTH_CALLS_AND_RETURNS
   // The LR is signed with its address inside the register state.  Time
   // to resign to be a regular ROP protected signed pointer
   add    x1, x0, #0x100
@@ -706,7 +706,7 @@ DEFINE_LIBUNWIND_FUNCTION(__libunwind_Registers_arm64_jumpto)
 Lnogcs:
 #endif
 
-#if __has_feature(ptrauth_calls)
+#ifdef LIBUNWIND_PTRAUTH_CALLS_AND_RETURNS
   retab
 #else
   ret    x30                    // jump to pc

libunwind/src/UnwindRegistersSave.S

@@ -768,7 +768,7 @@ LnoR2Fix:
   .p2align 2
 DEFINE_LIBUNWIND_FUNCTION(__unw_getcontext)
 
-#if __has_feature(ptrauth_calls)
+#ifdef LIBUNWIND_PTRAUTH_CALLS_AND_RETURNS
   pacibsp
 #endif
 
@@ -813,7 +813,7 @@ DEFINE_LIBUNWIND_FUNCTION(__unw_getcontext)
 #endif
   mov    x0, #0                   // return UNW_ESUCCESS
 
-#if __has_feature(ptrauth_calls)
+#ifdef LIBUNWIND_PTRAUTH_CALLS_AND_RETURNS
   retab
 #else
   ret