arm64e/ptrauth unified patch: compiler-rt

Author: ahmedbougacha

compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake

@@ -18,7 +18,7 @@ set(WASM64 wasm64)
 set(VE ve)
 
 if(APPLE)
-  set(ARM64 arm64)
+  set(ARM64 arm64 arm64e)
   set(ARM32 armv7 armv7s armv7k)
   set(X86_64 x86_64 x86_64h)
 endif()

compiler-rt/lib/asan/scripts/asan_symbolize.py

@@ -59,6 +59,7 @@ def is_valid_arch(s):
         "armv7s",
         "armv7k",
         "arm64",
+        "arm64e",
         "powerpc64",
         "powerpc64le",
         "s390x",

compiler-rt/lib/sanitizer_common/sanitizer_common.h

@@ -721,6 +721,7 @@ enum ModuleArch {
   kModuleArchARMV7S,
   kModuleArchARMV7K,
   kModuleArchARM64,
+  kModuleArchARM64E,
   kModuleArchLoongArch64,
   kModuleArchRISCV64,
   kModuleArchHexagon
@@ -794,6 +795,8 @@ inline const char *ModuleArchToString(ModuleArch arch) {
       return "armv7k";
     case kModuleArchARM64:
       return "arm64";
+    case kModuleArchARM64E:
+      return "arm64e";
     case kModuleArchLoongArch64:
       return "loongarch64";
     case kModuleArchRISCV64:

compiler-rt/lib/sanitizer_common/sanitizer_procmaps_mac.cpp

@@ -32,6 +32,9 @@
 #ifndef CPU_TYPE_ARM64
 #define CPU_TYPE_ARM64        (CPU_TYPE_ARM | CPU_ARCH_ABI64)
 #endif
+#ifndef CPU_SUBTYPE_ARM64_E
+#define CPU_SUBTYPE_ARM64_E   ((cpu_subtype_t)2)
+#endif
 
 namespace __sanitizer {
 
@@ -323,6 +326,8 @@ ModuleArch ModuleArchFromCpuType(cpu_type_t cputype, cpu_subtype_t cpusubtype) {
       CHECK(0 && "Invalid subtype of ARM");
       return kModuleArchUnknown;
     case CPU_TYPE_ARM64:
+      if (cpusubtype == CPU_SUBTYPE_ARM64_E)
+        return kModuleArchARM64E;
       return kModuleArchARM64;
     default:
       CHECK(0 && "Invalid CPU type");

compiler-rt/lib/sanitizer_common/sanitizer_stacktrace.cpp

@@ -17,6 +17,10 @@
 #include "sanitizer_platform.h"
 #include "sanitizer_ptrauth.h"
 
+#if __has_feature(ptrauth_returns)
+#include <ptrauth.h>
+#endif
+
 namespace __sanitizer {
 
 uptr StackTrace::GetNextInstructionPc(uptr pc) {
@@ -132,6 +136,9 @@ void BufferedStackTrace::UnwindFast(uptr pc, uptr bp, uptr stack_top,
     // a platform where this isn't true, we need to reconsider this check.
     if (pc1 < kPageSize)
       break;
+#if __has_feature(ptrauth_returns)
+    pc1 = (uhwptr)ptrauth_strip((void *)pc1, ptrauth_key_return_address);
+#endif
     if (pc1 != pc) {
       trace_buffer[size++] = (uptr) pc1;
     }

compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_libcdep.cpp

@@ -263,6 +263,8 @@ class LLVMSymbolizerProcess final : public SymbolizerProcess {
     const char *const kSymbolizerArch = "--default-arch=loongarch64";
 #elif SANITIZER_RISCV64
     const char *const kSymbolizerArch = "--default-arch=riscv64";
+#elif defined(__arm64e__)
+    const char* const kSymbolizerArch = "--default-arch=arm64e";
 #elif defined(__aarch64__)
     const char* const kSymbolizerArch = "--default-arch=arm64";
 #elif defined(__arm__)

compiler-rt/lib/ubsan/ubsan_type_hash_itanium.cpp

@@ -207,7 +207,7 @@ struct VtablePrefix {
   std::type_info *TypeInfo;
 };
 VtablePrefix *getVtablePrefix(void *Vtable) {
-  Vtable = ptrauth_auth_data(Vtable, ptrauth_key_cxx_vtable_pointer, 0);
+  Vtable = ptrauth_strip(Vtable, ptrauth_key_cxx_vtable_pointer);
   VtablePrefix *Vptr = reinterpret_cast<VtablePrefix*>(Vtable);
   VtablePrefix *Prefix = Vptr - 1;
   if (!IsAccessibleMemoryRange((uptr)Prefix, sizeof(VtablePrefix)))