commit a307c4b4bf1a329bccd8e3f864fcc8b8939f0ecf
author Roy Sundahl <rsundahl@apple.com> Wed Nov 30 09:57:06 2022 -0800
committer Copybara-Service <copybara-worker@google.com> Wed Nov 30 13:20:40 2022 -0800
tree d619977cb3b1e531dd4d5e9065b02b6e6a93a214
parent b4095f28eb9b1864ac50d3d9101da545ebd93171

[asan][aarch64] Don't use 64 bit allocator for Apple ios family

The recent change (https://reviews.llvm.org/D137136) to unconditionally
choose the 64 bit allocator on aarch64 breaks Apple iOS family of devices
which purposely use a smaller address space than is used with macOS.

rdar://102527313

Reviewed By: thetruestblue, yln

Differential Revision: https://reviews.llvm.org/D139030

GitOrigin-RevId: ad6c8092dcb26b6991bab078e0e6cf1ab4836add

lib/sanitizer_common/sanitizer_platform.h

diff --git a/lib/sanitizer_common/sanitizer_platform.h b/lib/sanitizer_common/sanitizer_platform.h
index 7ecc465..98dbfe1 100644
--- a/lib/sanitizer_common/sanitizer_platform.h
+++ b/lib/sanitizer_common/sanitizer_platform.h
@@ -287,7 +287,8 @@
 #  if (SANITIZER_ANDROID && defined(__aarch64__)) || SANITIZER_FUCHSIA
 #    define SANITIZER_CAN_USE_ALLOCATOR64 1
 #  elif defined(__mips64) || defined(__arm__) || defined(__i386__) || \
-      SANITIZER_RISCV64 || defined(__hexagon__)
+      SANITIZER_RISCV64 || defined(__hexagon__) || \
+      (SANITIZER_APPLE && defined(__aarch64__))
 #    define SANITIZER_CAN_USE_ALLOCATOR64 0
 #  else
 #    define SANITIZER_CAN_USE_ALLOCATOR64 (SANITIZER_WORDSIZE == 64)