better

Author: LouisBrunner

.github/workflows/build.yml

@@ -66,9 +66,9 @@ jobs:
         with:
           name: a.out
           path: a.out*
-      - name: upload dyld cache
+      - name: upload vg artifacts
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: dyld_cache
-          path: /System/Volumes/Preboot/Cryptexes/OS/System/Library/dyld/dyld_shared_cache_x86_64h*
+          name: vg
+          path: memcheck/vgpreload_memcheck-amd64-darwin.so

coregrind/m_mach/dyld_cache.c

@@ -208,19 +208,22 @@ Addr VG_(dyld_cache_get_slide)(void) {
   return dyld_cache.slide;
 }
 
-void VG_(dyld_cache_init)(void) {
+void VG_(dyld_cache_init)(Bool is_dynamic) {
   if (!try_to_init()) {
     VG_(dmsg)(
       "WARNING: could not read from dyld shared cache (DSC)\n"
       "Some reports (especially memory leaks) might be missing or incorrect (false-positives)\n"
     );
     return;
   }
-  // We currently detect if dyld is loading/using a library by checking if stat64 fails.
-  // However, dyld doesn't seem to call stat64 for all of them anymore.
-  VG_(dyld_cache_load_library)("/usr/lib/system/libsystem_kernel.dylib");
-  VG_(dyld_cache_load_library)("/usr/lib/system/libsystem_pthread.dylib");
-  VG_(dyld_cache_load_library)("/usr/lib/system/libsystem_platform.dylib");
+  if (is_dynamic) {
+    // We currently detect if dyld is loading/using a library by checking if stat64 fails.
+    // However, dyld doesn't seem to call stat64 for all of them anymore.
+    // All arm64 binaries are executables but some x86 ones might not be so let's avoid them just to be safe.
+    VG_(dyld_cache_load_library)("/usr/lib/system/libsystem_kernel.dylib");
+    VG_(dyld_cache_load_library)("/usr/lib/system/libsystem_pthread.dylib");
+    VG_(dyld_cache_load_library)("/usr/lib/system/libsystem_platform.dylib");
+  }
 }
 
 int VG_(dyld_cache_might_be_in)(const HChar* path) {

coregrind/m_main.c

@@ -1951,7 +1951,7 @@ Int valgrind_main ( Int argc, HChar **argv, HChar **envp )
    //   p: none
    //--------------------------------------------------------------
 #  if defined(VGO_darwin) && DARWIN_VERS >= DARWIN_11_00
-   VG_(dyld_cache_init)();
+   VG_(dyld_cache_init)(the_iicii.dynamic);
 #  endif
 
    //--------------------------------------------------------------

coregrind/pub_core_mach.h

@@ -72,7 +72,7 @@ extern void VG_(mach_record_system_memory)(void);
 #if DARWIN_VERS >= DARWIN_11_00
 // Dyld shared cache (DSC) parsing, which is required as system libraries are not provided on disk
 // starting with macOS 11.0 (Big Sur)
-extern void VG_(dyld_cache_init)(void);
+extern void VG_(dyld_cache_init)(Bool is_dynamic);
 extern int VG_(dyld_cache_might_be_in)(const HChar*);
 extern int VG_(dyld_cache_load_library)(const HChar*);
 extern Addr VG_(dyld_cache_get_slide)(void);