From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Thu, 28 Dec 2023 09:41:54 +0000 (+0100)
Subject: Darwin: Fix bad merge of coregrind/m_debuginfo/debuginfo.c
X-Git-Tag: VALGRIND_3_23_0~209
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47bb3b13c1bd8307b6e57b756b04052a9b683e5f;p=thirdparty%2Fvalgrind.git

Darwin: Fix bad merge of coregrind/m_debuginfo/debuginfo.c
---

diff --git a/coregrind/m_debuginfo/debuginfo.c b/coregrind/m_debuginfo/debuginfo.c
index e4450afc47..6fec43e869 100644
--- a/coregrind/m_debuginfo/debuginfo.c
+++ b/coregrind/m_debuginfo/debuginfo.c
@@ -1387,9 +1387,10 @@ ULong VG_(di_notify_mmap)( Addr a, Bool allow_SkFileV, Int use_fd )
       return 0;
    vg_assert(sr_Res(preadres) > 0 && sr_Res(preadres) <= sizeof(buf1k) );
 
-   if (!ML_(is_macho_object_file)( buf1k, (SizeT)sr_Res(preadres) ))
+   rw_load_count = 0;
+
+   if (!ML_(check_macho_and_get_rw_loads)( buf4k, (SizeT)sr_Res(preadres), &rw_load_count ))
       return 0;
-   rw_load_count = 1;
 #endif
 
    /* We're only interested in mappings of object files. */