[PR] vitalybuka - move aligned_alloc def up to all interceptors

Author: cjappl

compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp

@@ -461,19 +461,6 @@ INTERCEPTOR(void *, valloc, SIZE_T size) {
   return REAL(valloc)(size);
 }
 
-// aligned_alloc was introduced in OSX 10.15
-// Linking will fail when using an older SDK
-#if SANITIZER_APPLE && defined(__MAC_10_15)
-// macOS 10.15 is greater than our minimal deployment target.  To ensure we
-// generate a weak reference so the dylib continues to work on older
-// systems, we need to forward declare the intercepted function as "weak
-// imports".
-SANITIZER_WEAK_IMPORT void *aligned_alloc(SIZE_T __alignment, SIZE_T __size);
-
-#undef SANITIZER_INTERCEPT_ALIGNED_ALLOC
-#define SANITIZER_INTERCEPT_ALIGNED_ALLOC 1
-#endif // SANITIZER_APPLE && defined(__MAC_10_15)
-
 #if SANITIZER_INTERCEPT_ALIGNED_ALLOC
 INTERCEPTOR(void *, aligned_alloc, SIZE_T alignment, SIZE_T size) {
   __rtsan_notify_intercepted_call("aligned_alloc");

compiler-rt/lib/rtsan/tests/rtsan_test_interceptors_posix.cpp

@@ -121,10 +121,10 @@ TEST(TestRtsanInterceptors, VallocDiesWhenRealtime) {
 }
 
 #if __has_builtin(__builtin_available) && SANITIZER_APPLE
-#define ALIGNED_ALLOC_AVAILABLE() __builtin_available(macOS 10.15, *)
+#define ALIGNED_ALLOC_AVAILABLE() (__builtin_available(macOS 10.15, *))
 #else
 // We are going to assume this is true until we hit systems where it isn't
-#define ALIGNED_ALLOC_AVAILABLE() true
+#define ALIGNED_ALLOC_AVAILABLE() (true)
 #endif
 
 TEST(TestRtsanInterceptors, AlignedAllocDiesWhenRealtime) {

compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h

@@ -84,6 +84,10 @@
 #define SI_NOT_MAC 1
 #endif
 
+#if SANITIZER_APPLE
+#  include <Availability.h>
+#endif
+
 #if SANITIZER_IOS
 #define SI_IOS 1
 #else
@@ -503,7 +507,27 @@
 #define SANITIZER_INTERCEPT_PVALLOC (SI_GLIBC || SI_ANDROID)
 #define SANITIZER_INTERCEPT_CFREE (SI_GLIBC && !SANITIZER_RISCV64)
 #define SANITIZER_INTERCEPT_REALLOCARRAY SI_POSIX
-#define SANITIZER_INTERCEPT_ALIGNED_ALLOC (!SI_MAC)
+
+#if SANITIZER_APPLE && defined(__MAC_10_15)
+#  define SI_MAC_SDK_10_15_AVAILABLE 1
+#else
+#  define SI_MAC_SDK_10_15_AVAILABLE 0
+#endif  // SANITIZER_APPLE && defined(__MAC_10_15)
+
+// aligned_alloc was introduced in OSX 10.15
+// Linking will fail when using an older SDK
+#if SI_MAC_SDK_10_15_AVAILABLE
+// macOS 10.15 is greater than our minimal deployment target.  To ensure we
+// generate a weak reference so the dylib continues to work on older
+// systems, we need to forward declare the intercepted function as "weak
+// imports".
+SANITIZER_WEAK_IMPORT void *aligned_alloc(__sanitizer::usize __alignment,
+                                          __sanitizer::usize __size);
+#endif  // SI_MAC_SDK_10_15_AVAILABLE
+
+#define SANITIZER_INTERCEPT_ALIGNED_ALLOC \
+  (!SI_MAC || SI_MAC_SDK_10_15_AVAILABLE)
+
 #define SANITIZER_INTERCEPT_MALLOC_USABLE_SIZE (!SI_MAC && !SI_NETBSD)
 #define SANITIZER_INTERCEPT_MCHECK_MPROBE SI_LINUX_NOT_ANDROID
 #define SANITIZER_INTERCEPT_WCSLEN 1