yet more cleaning up

ojhunt · ojhunt · commit d6375dd20bae · 2025-09-27T16:50:17.000-07:00
diff --git a/compiler-rt/lib/builtins/crtbegin.c b/compiler-rt/lib/builtins/crtbegin.c
@@ -16,12 +16,6 @@
 #include <ptrauth.h>
 #endif
 
-#if __has_feature(ptrauth_calls) || defined(__PTRAUTH__)
-#define __crtbegin_has_ptrauth 1
-#else
-#define __crtbegin_has_ptrauth 0
-#endif
-
 __attribute__((visibility("hidden"))) void *__dso_handle = &__dso_handle;
 
 #ifdef EH_USE_FRAME_REGISTRY
@@ -72,7 +66,7 @@ __attribute__((section(".init_array"), used)) static void *__init =
     ptrauth_sign_constant(&__do_init, ptrauth_key_init_fini_pointer,
                           __ptrauth_init_fini_discriminator);
 #  endif
-# elif __crtbegin_has_ptrauth
+# elif __has_feature(ptrauth_calls)
 #  ifdef __aarch64__
 // If ptrauth_init_fini feature is not present, compiler emits raw unsigned
 // pointers in .init_array. Use inline assembly to avoid implicit signing of
@@ -154,7 +148,7 @@ __attribute__((section(".fini_array"), used)) static void *__fini =
     ptrauth_sign_constant(&__do_fini, ptrauth_key_init_fini_pointer,
                           __ptrauth_init_fini_discriminator);
 #  endif
-# elif __crtbegin_has_ptrauth
+# elif __has_feature(ptrauth_calls)
 #  ifdef __aarch64__
 // If ptrauth_init_fini feature is not present, compiler emits raw unsigned
 // pointers in .fini_array. Use inline assembly to avoid implicit signing of
diff --git a/compiler-rt/lib/builtins/gcc_personality_v0.c b/compiler-rt/lib/builtins/gcc_personality_v0.c
@@ -30,11 +30,9 @@ EXCEPTION_DISPOSITION _GCC_specific_handler(PEXCEPTION_RECORD, void *, PCONTEXT,
                                             _Unwind_Personality_Fn);
 #endif
 
-#if __has_feature(ptrauth_calls) || defined(__PTRAUTH__)
+#if __has_feature(ptrauth_calls)
 #include <ptrauth.h>
 
-#define __gcc_personality_has_ptrauth 1
-
 #if __has_feature(ptrauth_restricted_intptr_qualifier)
 #define __ptrauth_gcc_personality_intptr(key, addressDiscriminated,            \
                                               discriminator)                   \
@@ -45,7 +43,6 @@ EXCEPTION_DISPOSITION _GCC_specific_handler(PEXCEPTION_RECORD, void *, PCONTEXT,
   __ptrauth(key, addressDiscriminated, discriminator)
 #endif
 #else
-#define __gcc_personality_has_ptrauth 0
 #define __ptrauth_gcc_personality_intptr(...)
 #endif
 
@@ -287,7 +284,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 __gcc_personality_has_ptrauth
+#if __has_feature(ptrauth_calls)
       uintptr_t stackPointer = _Unwind_GetGR(context, -2);
       const uintptr_t existingDiscriminator =
         ptrauth_blend_discriminator(&landingPad,
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_ptrauth.h b/compiler-rt/lib/sanitizer_common/sanitizer_ptrauth.h
@@ -9,7 +9,7 @@
 #ifndef SANITIZER_PTRAUTH_H
 #define SANITIZER_PTRAUTH_H
 
-#if __has_feature(ptrauth_calls) || defined(__PTRAUTH__)
+#if __has_feature(ptrauth_calls)
 #  include <ptrauth.h>
 #elif defined(__ARM_FEATURE_PAC_DEFAULT) && !defined(__APPLE__)
 // On the stack the link register is protected with Pointer
diff --git a/compiler-rt/test/asan/TestCases/Darwin/linked-only.cpp b/compiler-rt/test/asan/TestCases/Darwin/linked-only.cpp
@@ -10,7 +10,7 @@
 #include <string.h>
 
 #include "sanitizer/asan_interface.h"
-#if __has_feature(ptrauth_calls) || defined(__PTRAUTH__)
+#if __has_feature(ptrauth_calls)
 #  include <ptrauth.h>
 #endif
 
@@ -27,7 +27,7 @@ int main(int argc, char *argv[]) {
   // CHECK: =-1=
 
   char *mainptr;
-#if __has_feature(ptrauth_calls) || defined(__PTRAUTH__)
+#if __has_feature(ptrauth_calls)
   mainptr = (char *)ptrauth_strip((void *)&main, ptrauth_key_return_address);
 #else
   mainptr = (char *)&main;
diff --git a/compiler-rt/test/asan/TestCases/zero_page_pc.cpp b/compiler-rt/test/asan/TestCases/zero_page_pc.cpp
@@ -9,14 +9,14 @@
 #  define __has_feature(x) 0
 #endif
 
-#if __has_feature(ptrauth_calls) || defined(__PTRAUTH__)
+#if __has_feature(ptrauth_calls)
 #  include <ptrauth.h>
 #endif
 
 typedef void void_f();
 int main() {
   void_f *func = (void_f *)0x4;
-#if __has_feature(ptrauth_calls) || defined(__PTRAUTH__)
+#if __has_feature(ptrauth_calls)
   func = ptrauth_sign_unauthenticated(
       func, ptrauth_key_function_pointer, 0);
 #endif
diff --git a/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_control_flow.cpp b/compiler-rt/test/sanitizer_common/TestCases/sanitizer_coverage_control_flow.cpp
@@ -8,7 +8,7 @@
 
 #include <cstdint>
 #include <cstdio>
-#if __has_feature(ptrauth_calls) || defined(__PTRAUTH__)
+#if __has_feature(ptrauth_calls)
   #include <ptrauth.h>
 #else
   #define ptrauth_strip(__value, __key) (__value)
diff --git a/compiler-rt/test/ubsan/TestCases/TypeCheck/vptr-corrupted-vtable-itanium.cpp b/compiler-rt/test/ubsan/TestCases/TypeCheck/vptr-corrupted-vtable-itanium.cpp
@@ -6,11 +6,9 @@
 
 #include <typeinfo>
 
-#if __has_feature(ptrauth_calls) || defined(__PTRAUTH__)
-#define __has_ptrauth 1
+#if __has_feature(ptrauth_calls)
 #include <ptrauth.h>
 #else
-#define __has_ptrauth 0
 #endif
 
 struct S {
@@ -31,7 +29,7 @@ int main(int argc, char **argv) {
   S Obj;
   void *Ptr = &Obj;
   void *VtablePtr = *reinterpret_cast<void**>(Ptr);
-#if __has_ptrauth
+#if __has_feature(ptrauth_calls)
   VtablePtr = ptrauth_strip(VtablePtr, 0);
 #endif
   VtablePrefix* Prefix = reinterpret_cast<VtablePrefix*>(VtablePtr) - 1;
@@ -42,7 +40,7 @@ int main(int argc, char **argv) {
 
   // Hack Vtable ptr for Obj.
   void *FakeVtablePtr = static_cast<void*>(&FakePrefix[1]);
-#if __has_ptrauth
+#if __has_feature(ptrauth_calls)
   FakeVtablePtr = ptrauth_sign_unauthenticated(
       FakeVtablePtr, ptrauth_key_cxx_vtable_pointer, 0);
 #endif
diff --git a/libcxx/src/include/overridable_function.h b/libcxx/src/include/overridable_function.h
@@ -13,7 +13,7 @@
 #include <__config>
 #include <cstdint>
 
-#if __ptrauth_cxxabi_has_ptrauth
+#if __has_feature(ptrauth_calls)
 #  include <ptrauth.h>
 #endif
 
@@ -83,7 +83,7 @@ _LIBCPP_HIDE_FROM_ABI inline bool __is_function_overridden() noexcept {
   uintptr_t __end   = reinterpret_cast<uintptr_t>(&__lcxx_override_end);
   uintptr_t __ptr   = reinterpret_cast<uintptr_t>(_Func);
 
-#  if __ptrauth_cxxabi_has_ptrauth
+#  if __has_feature(ptrauth_calls)
   // We must pass a void* to ptrauth_strip since it only accepts a pointer type. Also, in particular,
   // we must NOT pass a function pointer, otherwise we will strip the function pointer, and then attempt
   // to authenticate and re-sign it when casting it to a uintptr_t again, which will fail because we just
@@ -117,7 +117,7 @@ _LIBCPP_HIDE_FROM_ABI inline bool __is_function_overridden() noexcept {
   uintptr_t __end   = reinterpret_cast<uintptr_t>(&__stop___lcxx_override);
   uintptr_t __ptr   = reinterpret_cast<uintptr_t>(_Func);
 
-#  if __ptrauth_cxxabi_has_ptrauth
+#  if __has_feature(ptrauth_calls)
   // We must pass a void* to ptrauth_strip since it only accepts a pointer type. See full explanation above.
   __ptr = reinterpret_cast<uintptr_t>(ptrauth_strip(reinterpret_cast<void*>(__ptr), ptrauth_key_function_pointer));
 #  endif
diff --git a/libcxxabi/include/__cxxabi_config.h b/libcxxabi/include/__cxxabi_config.h
@@ -107,9 +107,7 @@
 #  include <ptrauth.h>
 #endif
 
-#if __has_feature(ptrauth_calls) || defined(__PTRAUTH__)
-
-#  define __ptrauth_cxxabi_has_ptrauth 1
+#if __has_feature(ptrauth_calls)
 
 // ptrauth_string_discriminator("__cxa_exception::actionRecord") == 0xFC91
 #  define __ptrauth_cxxabi_action_record \
@@ -141,8 +139,6 @@
 
 #else
 
-#  define __ptrauth_cxxabi_has_ptrauth 0
-
 #  define __ptrauth_cxxabi_action_record
 #  define __ptrauth_cxxabi_lsd
 #  define __ptrauth_cxxabi_catch_temp
diff --git a/libcxxabi/src/cxa_exception.cpp b/libcxxabi/src/cxa_exception.cpp
@@ -192,7 +192,9 @@ void *__cxa_allocate_exception(size_t thrown_size) throw() {
         std::terminate();
     __cxa_exception *exception_header =
         static_cast<__cxa_exception *>((void *)(raw_buffer + header_offset));
-    ::memset(exception_header, 0, actual_size);
+    // We warn on memset to a non-trivially castable type. We might want to
+    // change that diagnostic to not fire on a trivially obvious zero fill.
+    ::memset(static_cast<void *>(exception_header), 0, actual_size);
     return thrown_object_from_cxa_exception(exception_header);
 }
 
diff --git a/libcxxabi/src/cxa_personality.cpp b/libcxxabi/src/cxa_personality.cpp
@@ -20,9 +20,13 @@
 #include "cxa_exception.h"
 #include "cxa_handlers.h"
 #include "private_typeinfo.h"
-#include "unwind.h"
 
-#if __ptrauth_cxxabi_has_ptrauth
+#if __has_feature(ptrauth_calls)
+
+// CXXABI depends on defintions in libunwind as pointer auth couples the
+// definitions
+#include "libunwind.h"
+
 // The actual value of the discriminators listed below is not important.
 // The derivation of the constants is only being included for the purpose
 // of maintaining a record of how they were originally produced.
@@ -626,17 +630,18 @@ 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 __ptrauth_cxxabi_has_ptrauth
+#if __has_feature(ptrauth_calls)
   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
   const auto existingDiscriminator = ptrauth_blend_discriminator(
       &results.landingPad, __ptrauth_scan_results_landingpad_disc);
   unw_word_t newIP /* opaque __ptrauth(ptrauth_key_return_address, stackPointer, 0) */ =
-      (unw_word_t)ptrauth_auth_and_resign(*(void**)&results.landingPad,
+      (unw_word_t)ptrauth_auth_and_resign(*(void* const*)&results.landingPad,
                                           __ptrauth_scan_results_landingpad_key,
                                           existingDiscriminator,
-                                          ptrauth_key_return_address, stackPointer);
+                                          ptrauth_key_return_address,
+                                          stackPointer);
   _Unwind_SetIP(context, newIP);
 #else
   _Unwind_SetIP(context, results.landingPad);
diff --git a/libcxxabi/src/private_typeinfo.cpp b/libcxxabi/src/private_typeinfo.cpp
@@ -53,13 +53,13 @@
 #include <atomic>
 #endif
 
-#if __ptrauth_cxxabi_has_ptrauth
+#if __has_feature(ptrauth_calls)
 #include <ptrauth.h>
 #endif
 
 template <typename T>
 static inline T* strip_vtable(T* vtable) {
-#if __ptrauth_cxxabi_has_ptrauth
+#if __has_feature(ptrauth_calls)
   vtable = ptrauth_strip(vtable, ptrauth_key_cxx_vtable_pointer);
 #endif
   return vtable;
diff --git a/libunwind/include/libunwind.h b/libunwind/include/libunwind.h
@@ -43,14 +43,10 @@
   #define LIBUNWIND_AVAIL
 #endif
 
-#if __has_feature(ptrauth_calls) || defined(__PTRAUTH__)
+#if __has_feature(ptrauth_calls)
 
   #include <ptrauth.h>
 
-  // Local "has pointer auth" macro to for backwards compatibility
-  // with compilers that do not provide the __PTRAUTH__ macro
-  #define __libunwind_has_ptrauth 1
-
   #if __has_extension(ptrauth_restricted_intptr_qualifier)
     #define __unwind_ptrauth_restricted_intptr(...) \
       __ptrauth_restricted_intptr(__VA_ARGS__)
@@ -124,9 +120,6 @@
                                        __ptrauth_unwind_cie_info_personality_disc)
 
 #else
-  // We explicitly define the not enabled case so that checks fail if they
-  // do not include the correct definitions.
-  #define __libunwind_has_ptrauth 0
 
   #define __ptrauth_unwind_upi_handler
   #define __ptrauth_unwind_upi_handler_intptr
diff --git a/libunwind/src/DwarfParser.hpp b/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 __libunwind_has_ptrauth
+#if __has_feature(ptrauth_calls)
         if (personality) {
           // The GOT for the personality function was signed address
           // authenticated. Manually re-sign with the CIE_Info::personality
diff --git a/libunwind/src/Registers.hpp b/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 __libunwind_has_ptrauth
+#if __has_feature(ptrauth_calls)
     // 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 __libunwind_has_ptrauth
+#if __has_feature(ptrauth_calls)
     // 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 __libunwind_has_ptrauth
+#if __has_feature(ptrauth_calls)
   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 __libunwind_has_ptrauth
+#if __has_feature(ptrauth_calls)
   // 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 __libunwind_has_ptrauth
+#if __has_feature(ptrauth_calls)
   // We perform this step to ensure that we correctly authenticate and re-sign
   // the pc after the bitwise copy.
   setIP(other.getIP());
diff --git a/libunwind/src/UnwindCursor.hpp b/libunwind/src/UnwindCursor.hpp
@@ -1051,7 +1051,7 @@ class UnwindCursor : public AbstractUnwindCursor{
                                const UnwindInfoSections &sects,
                                uint32_t fdeSectionOffsetHint = 0);
   int stepWithDwarfFDE(bool stage2) {
-#if __libunwind_has_ptrauth
+#if __has_feature(ptrauth_calls)
     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 __libunwind_has_ptrauth
+#if __has_feature(ptrauth_calls)
     // 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 __libunwind_has_ptrauth
+#if __has_feature(ptrauth_calls)
   _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 __libunwind_has_ptrauth
+#if __has_feature(ptrauth_calls)
   typename R::reg_t rawPC = this->getReg(UNW_REG_IP);
   typename R::link_reg_t pc;
   _registers.loadAndAuthenticateLinkRegister(rawPC, &pc);
diff --git a/libunwind/src/UnwindLevel1.c b/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 __libunwind_has_ptrauth
+#if __has_feature(ptrauth_calls)
   // If we are in an arm64e frame, then the PC should have been signed with the
   // sp
   {
diff --git a/libunwind/src/UnwindRegistersRestore.S b/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) || defined(__PTRAUTH__)
+#if __has_feature(ptrauth_calls)
   // 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) || defined(__PTRAUTH__)
+#if __has_feature(ptrauth_calls)
   retab
 #else
   ret    x30                    // jump to pc
diff --git a/libunwind/src/UnwindRegistersSave.S b/libunwind/src/UnwindRegistersSave.S
diff --git a/libunwind/src/libunwind.cpp b/libunwind/src/libunwind.cpp
