fix(amd64): properly load libsystem_* in macOS 11+

Author: LouisBrunner

coregrind/m_mach/dyld_cache.c

@@ -149,6 +149,7 @@ static int try_to_init(void) {
     dyld_cache.header = (const dyld_cache_header *) cache_address;
     const dyld_cache_mapping_info* mappings = (const dyld_cache_mapping_info*)(calculate_relative(dyld_cache.header, dyld_cache.header->mappingOffset));
     dyld_cache.slide = cache_address - mappings[0].address;
+    VG_(debugLog)(2, "dyld_cache", "dyld cache slide: %#lx\n", dyld_cache.slide);
 
     if (!try_to_init_header(cache_address)) {
       return 0;
@@ -208,23 +209,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;
   }
-#if defined(VGP_arm64_darwin)
-  // 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.
-  // Because dynamic binaries on arm64 are mandatory, they will necessarily include those,
-  // so we request them to be loaded right away to ensure we have their symbols.
-  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");
-#endif
+  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

@@ -1976,7 +1976,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);