commit 93beee0fc6ab71ac54ebbdf28e625293541cf0d0
author Blue Gaston <blueg@Blues-MacBook-Pro.local> Wed Aug 03 15:09:50 2022 -0700
committer Copybara-Service <copybara-worker@google.com> Wed Aug 03 15:54:25 2022 -0700
tree d99a58c8de91a7cf235e4df77bd6fee3e6a3c37a
parent 5c93fd9693bbe0a05ba966ed0d2a933b62bc45b3

[TSAN][Darwin] x86_64 specific tests requiring weak symbols

Additional tests requiring weak symbol attribute work around for macOS 12.0

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

GitOrigin-RevId: 42c15ca630126cafdd646ac3874fc6b1a110a8ca

test/tsan/java_symbolization.cpp

diff --git a/test/tsan/java_symbolization.cpp b/test/tsan/java_symbolization.cpp
index 534dc5d..e6a3ee8 100644
--- a/test/tsan/java_symbolization.cpp
+++ b/test/tsan/java_symbolization.cpp
@@ -2,7 +2,11 @@
 #include "java.h"
 #include <memory.h>
 
-extern "C" __attribute__((disable_sanitizer_instrumentation)) void
+#if (__APPLE__)
+__attribute__((weak)) // Required for dyld macOS 12.0+
+#endif
+__attribute__((disable_sanitizer_instrumentation))
+extern "C" void
 __tsan_symbolize_external_ex(jptr pc,
                              void (*add_frame)(void *, const char *,
                                                const char *, int, int),

test/tsan/java_symbolization_legacy.cpp

diff --git a/test/tsan/java_symbolization_legacy.cpp b/test/tsan/java_symbolization_legacy.cpp
index ed7ffd3..bdf986a 100644
--- a/test/tsan/java_symbolization_legacy.cpp
+++ b/test/tsan/java_symbolization_legacy.cpp
@@ -2,7 +2,11 @@
 #include "java.h"
 #include <memory.h>
 
-extern "C" __attribute__((disable_sanitizer_instrumentation)) bool
+#if (__APPLE__)
+__attribute__((weak)) // Required for dyld macOS 12.0+
+#endif
+__attribute__((disable_sanitizer_instrumentation))
+extern "C" bool
 __tsan_symbolize_external(jptr pc, char *func_buf, jptr func_siz,
                           char *file_buf, jptr file_siz, int *line, int *col) {
   if (pc == (1234 | kExternalPCBit)) {