Review comments pt. 1

Author: cjappl

compiler-rt/lib/radsan/tests/radsan_test.cpp

@@ -21,6 +21,15 @@
 #include <shared_mutex>
 #include <thread>
 
+#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && \
+    __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101200
+#define SI_MAC_DEPLOYMENT_AT_LEAST_10_12 1
+#else
+#define SI_MAC_DEPLOYMENT_AT_LEAST_10_12 0
+#endif
+
+#define RADSAN_TEST_SHARED_MUTEX (!(SI_MAC) || SI_MAC_DEPLOYMENT_AT_LEAST_10_12)
+
 using namespace testing;
 using namespace radsan_testing;
 using namespace std::chrono_literals;
@@ -100,7 +109,7 @@ TEST(TestRadsan, unlockingAMutexDiesWhenRealtime) {
 }
 
 
-#if SANITIZER_INTERCEPT_SHARED_MUTEX
+#if RADSAN_TEST_SHARED_MUTEX
 
 TEST(TestRadsan, lockingASharedMutexDiesWhenRealtime) {
   auto mutex = std::shared_mutex();
@@ -132,7 +141,7 @@ TEST(TestRadsan, sharedUnlockingASharedMutexDiesWhenRealtime) {
   expectNonrealtimeSurvival(func);
 }
 
-#endif // SANITIZER_INTERCEPT_SHARED_MUTEX
+#endif // RADSAN_TEST_SHARED_MUTEX
 
 TEST(TestRadsan, launchingAThreadDiesWhenRealtime) {
   auto func = [&]() {

compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h

@@ -493,7 +493,6 @@
 #define SANITIZER_INTERCEPT_CFREE (SI_GLIBC && !SANITIZER_RISCV64)
 #define SANITIZER_INTERCEPT_REALLOCARRAY SI_POSIX
 #define SANITIZER_INTERCEPT_ALIGNED_ALLOC (!(SI_MAC) || SI_MAC_DEPLOYMENT_AT_LEAST_10_15)
-#define SANITIZER_INTERCEPT_SHARED_MUTEX (!(SI_MAC) || SI_MAC_DEPLOYMENT_AT_LEAST_10_12)
 #define SANITIZER_INTERCEPT_MALLOC_USABLE_SIZE (!SI_MAC && !SI_NETBSD)
 #define SANITIZER_INTERCEPT_MCHECK_MPROBE SI_LINUX_NOT_ANDROID
 #define SANITIZER_INTERCEPT_WCSLEN 1
@@ -525,13 +524,6 @@
 #define SI_MAC_DEPLOYMENT_BELOW_10_10 0
 #endif
 
-#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && \
-    __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101200
-#define SI_MAC_DEPLOYMENT_AT_LEAST_10_12 1
-#else
-#define SI_MAC_DEPLOYMENT_AT_LEAST_10_12 0
-#endif
-
 #if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && \
     __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101500
 #define SI_MAC_DEPLOYMENT_AT_LEAST_10_15 1