[Valgrind-developers] [valgrind] Darwin Helgrind/DRD: change pthread lib, more filters and suppressions

[Paul F. <pa...@so...>]

https://sourceware.org/cgit/valgrind/commit/?id=d4d17178aba87645c41e4ed105e7c520c6ab2dec

commit d4d17178aba87645c41e4ed105e7c520c6ab2dec
Author: Paul Floyd <pj...@wa...>
Date:   Fri Nov 28 07:44:51 2025 +0100

    Darwin Helgrind/DRD: change pthread lib, more filters and suppressions
    
    And turn off one test that is hanging. More to come.

Diff:
---
 darwin17.supp                   | 41 ++++++++++++++++-------------------------
 helgrind/tests/bug484480.vgtest |  1 +
 include/pub_tool_redir.h        |  3 ++-
 tests/filter_stderr_basic.in    |  5 +++--
 4 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/darwin17.supp b/darwin17.supp
index c701782af8..90d99f0748 100644
--- a/darwin17.supp
+++ b/darwin17.supp
@@ -617,28 +617,10 @@
    obj:*libdispatch.dylib*
 }
 
-##{
-##   OSX1013:CoreImage-1
-##   Memcheck:Cond
-##   obj:*CoreImage.framework*CoreImage*
-##   obj:*CoreImage.framework*CoreImage*
-##   obj:*CoreImage.framework*CoreImage*
-##}
-
-##{
-##   OSX1013:strncpy-1
-##   Memcheck:Cond
-##   fun:strncpy
-##   obj:*CoreServicesInternal.framework*CoreServicesInternal
-##   obj:*CoreServicesInternal.framework*CoreServicesInternal
-##}
-
 {
    OSX1013:pthread_rwlock_init
    Memcheck:Cond
    fun:pthread_rwlock_init
-   obj:*ImageIO.framework*ImageIO*
-   obj:*ImageIO.framework*ImageIO*
 }
 
 {
@@ -756,13 +738,6 @@
    fun:setenv
 }
 
-# See https://bugs.kde.org/show_bug.cgi?id=196528
-{
-macos-__pthread_rwlock_init-see-our-bug-196528
-Memcheck:Cond
-fun:pthread_rwlock_init
-}
-
 # macOS 10.13 mach-o loader at startup
 {
    OSX1013:map_images-1
@@ -780,6 +755,7 @@ fun:pthread_rwlock_init
    fun:map_images_nolock
    fun:map_images
 }
+
 {
    OSX1013:map_images-3
    Memcheck:Leak
@@ -1127,6 +1103,20 @@ fun:pthread_rwlock_init
    fun:nw_path_copy_interface_with_generation_internal
 }
 
+
+{
+   OSX1013:helgrind:rwlock_tt<false>::read()
+   Helgrind:Race
+   fun:_ZN9rwlock_ttILb0EE4readEv
+}
+
+{
+   OSX1013:helgrind:rwlock_tt<false>::write()
+   Helgrind:Race
+   fun:_ZN9rwlock_ttILb0EE5writeEv
+}
+
+
 {
    OSX1013:drd:object_dispose
    drd:ConflictingAccess
@@ -1160,3 +1150,4 @@ fun:pthread_rwlock_init
    ...
    fun:xpc_pipe_routine
 }
+
diff --git a/helgrind/tests/bug484480.vgtest b/helgrind/tests/bug484480.vgtest
index b130a2744e..44e7c68bb8 100644
--- a/helgrind/tests/bug484480.vgtest
+++ b/helgrind/tests/bug484480.vgtest
@@ -1,2 +1,3 @@
+prereq: ! ../../tests/os_test darwin
 vgopts: -q
 prog: bug484480
diff --git a/include/pub_tool_redir.h b/include/pub_tool_redir.h
index 043f8ac520..f2d7681087 100644
--- a/include/pub_tool_redir.h
+++ b/include/pub_tool_redir.h
@@ -289,7 +289,8 @@
 #elif defined(VGO_freebsd)
 #  define  VG_Z_LIBPTHREAD_SONAME  libthrZdsoZa          // libthr.so*
 #elif defined(VGO_darwin)
-#  define  VG_Z_LIBPTHREAD_SONAME  libSystemZdZaZddylib  // libSystem.*.dylib
+//#  define  VG_Z_LIBPTHREAD_SONAME  libSystemZdZaZddylib  // libSystem.*.dylib
+#  define  VG_Z_LIBPTHREAD_SONAME  libsystemZupthreadZddylib  // libSystem.*.dylib
 #elif defined(VGO_solaris)
 #  define  VG_Z_LIBPTHREAD_SONAME  libpthreadZdsoZd1     // libpthread.so.1
 #else
diff --git a/tests/filter_stderr_basic.in b/tests/filter_stderr_basic.in
index 8f9a0e200d..b0d37d9f1b 100644
--- a/tests/filter_stderr_basic.in
+++ b/tests/filter_stderr_basic.in
@@ -83,6 +83,7 @@ $SED '/warning: evaluate_Dwarf3_Expr: unhandled DW_OP_/d' |
 $SED '/^used_suppression:.*OSX.*dyld.*default.supp:*/d' |
 # Suppress Darwin running dsymutil
 $SED -e '/run: \/usr\/bin\/dsymutil.*/d' |
-# Suppress Darwin unknown mach ports
-$SED -e '/UNKNOWN Mach port modified/d'
+# Suppress Darwin unknown mach ports and mach_msg
+$SED -e '/UNKNOWN Mach port modified/d' |
+$SED -e '/UNKNOWN mach_msg unhandled MACH_SEND_TRAILER option/d'