fix: post merge issues

Author: LouisBrunner

.github/ubuntu-24.04-expected.txt

@@ -1,14 +1,2 @@
-none/tests/fdleak_cmsg                   (stderr)
-none/tests/fdleak_cmsg_supp              (stderr)
-none/tests/fdleak_creat                  (stderr)
-none/tests/fdleak_creat_sup              (stderr)
-none/tests/fdleak_dup                    (stderr)
-none/tests/fdleak_dup2                   (stderr)
-none/tests/fdleak_fcntl                  (stderr)
-none/tests/fdleak_ipv4                   (stderr)
-none/tests/fdleak_open                   (stderr)
-none/tests/fdleak_pipe                   (stderr)
-none/tests/fdleak_socketpair             (stderr)
-none/tests/file_dclose                   (stderr)
-none/tests/file_dclose_sup               (stderr)
-none/tests/socket_close                  (stderr)
+none/tests/track_high                    (stderr)
+none/tests/track_yes                     (stderr)

coregrind/m_initimg/initimg-darwin.c

@@ -277,6 +277,55 @@ static HChar *copy_str(HChar **tab, const HChar *str)
    return orig;
 }
 
+/*
+ * @todo PJF Make this multi-platform
+ */
+static Bool try_get_interp(const HChar* args_exe, HChar* interp_out)
+{
+   HChar  hdr[4096];
+   Int    len = sizeof hdr;
+   SysRes res;
+   Int fd;
+   HChar* end;
+   HChar* cp;
+   HChar* interp;
+
+   res = VG_(open)(args_exe, VKI_O_RDONLY, 0);
+   if (sr_isError(res)) {
+      return False;
+   } else {
+      fd = sr_Res(res);
+   }
+
+   res = VG_(pread)(fd, hdr, len, 0);
+
+   if (sr_isError(res)) {
+      VG_(close)(fd);
+      return False;
+   } else {
+      len = sr_Res(res);
+   }
+
+   if (0 != VG_(memcmp)(hdr, "#!", 2)) {
+       VG_(close)(fd);
+      return False;
+   }
+
+   end    = hdr + len;
+   interp = hdr + 2;
+   while (interp < end && (*interp == ' ' || *interp == '\t'))
+      interp++;
+
+   for (cp = interp; cp < end && !VG_(isspace)(*cp); cp++)
+      ;
+
+   *cp = '\0';
+
+   VG_(sprintf)(interp_out, "%s", interp);
+
+   VG_(close)(fd);
+   return True;
+}
 
 /* ----------------------------------------------------------------
 
@@ -491,6 +540,17 @@ Addr setup_client_stack( void*  init_sp,
 
    /* client_SP is pointing at client's argc/argv */
 
+   if (VG_(resolved_exename) == NULL) {
+      const HChar *exe_name = VG_(find_executable)(VG_(args_the_exename));
+      HChar interp_name[VKI_PATH_MAX];
+      if (try_get_interp(exe_name, interp_name)) {
+         exe_name = interp_name;
+      }
+      HChar resolved_name[VKI_PATH_MAX];
+      VG_(realpath)(exe_name, resolved_name);
+      VG_(resolved_exename) = VG_(strdup)("initimg-darwin.scs.2", resolved_name);
+   }
+
    if (0) VG_(printf)("startup SP = %#lx\n", client_SP);
    return client_SP;
 }

coregrind/m_sigframe/sigframe-arm64-darwin.c

@@ -253,7 +253,7 @@ void VG_(sigframe_destroy)( ThreadId tid, Bool isRT )
 
    if (VG_(clo_trace_signals))
       VG_(message)(Vg_DebugMsg,
-                   "sigframe_destroy (thread %d): "
+                   "sigframe_destroy (thread %u): "
                    "valid magic; next PC=%#llx\n",
                    tid, tst->arch.vex.guest_PC);
 

memcheck/tests/wcpncpy.stderr.exp

@@ -1,19 +1,19 @@
 Conditional jump or move depends on uninitialised value(s)
-   at 0x........: wcpncpy (vg_replace_strmem.c:2583)
+   at 0x........: wcpncpy (vg_replace_strmem.c:2584)
    by 0x........: main (wcpncpy.c:14)
 
 Invalid write of size 4
-   at 0x........: wcpncpy (vg_replace_strmem.c:2583)
+   at 0x........: wcpncpy (vg_replace_strmem.c:2584)
    by 0x........: main (wcpncpy.c:27)
  Address 0x........ is 20 bytes inside a block of size 22 alloc'd
    at 0x........: malloc (vg_replace_malloc.c:...)
    by 0x........: main (wcpncpy.c:10)
 
 Source and destination overlap in wcpncpy(0x........, 0x........)
-   at 0x........: wcpncpy (vg_replace_strmem.c:2583)
+   at 0x........: wcpncpy (vg_replace_strmem.c:2584)
    by 0x........: main (wcpncpy.c:35)
 
 Source and destination overlap in wcpncpy(0x........, 0x........)
-   at 0x........: wcpncpy (vg_replace_strmem.c:2583)
+   at 0x........: wcpncpy (vg_replace_strmem.c:2584)
    by 0x........: main (wcpncpy.c:43)
 

none/tests/iropt-test/unary.c

@@ -162,7 +162,6 @@ get_expected_value(const irop_t *op, const test_data_t *data)
 // case Iop_16to1:   expected = opnd & 0x1;       break;
    case Iop_16to8:   expected = opnd & UINT8_MAX; break;
    case Iop_16HIto8: expected = opnd >> 8;        break;
-      break;
 
    case Iop_32to1:    expected = opnd & 0x1;        break;
    case Iop_32to8:    expected = opnd & UINT8_MAX;  break;