Merge branch 'main' into feat/fix-tools-drd

Author: LouisBrunner

.github/macos-13-expected.txt

@@ -14,29 +14,19 @@ memcheck/tests/bug155125                 (stderr)
 memcheck/tests/bug287260                 (stderr)
 memcheck/tests/bug445235_ada_demangle    (stderr)
 memcheck/tests/client-msg-as-xml         (stderr)
-memcheck/tests/clireq_nofill             (stderr)
-memcheck/tests/cond_ld                   (stderr)
-memcheck/tests/cond_st                   (stderr)
-memcheck/tests/custom_alloc              (stderr)
 memcheck/tests/darwin/aio                (stderr)
 memcheck/tests/darwin/bug437790          (stderr)
 memcheck/tests/darwin/env                (stderr)
 memcheck/tests/darwin/pth-supp           (stderr)
 memcheck/tests/darwin/scalar             (stderr)
 memcheck/tests/darwin/scalar_nocancel    (stderr)
 memcheck/tests/descr_belowsp             (stderr)
-memcheck/tests/err_disable1              (stderr)
-memcheck/tests/err_disable2              (stderr)
-memcheck/tests/err_disable3              (stderr)
 memcheck/tests/err_disable4              (stderr)
-memcheck/tests/errs1                     (stderr)
 memcheck/tests/file_locking              (stderr)
 memcheck/tests/gone_abrt_xml             (stderr)
-memcheck/tests/inits                     (stderr)
 memcheck/tests/inlinfo                   (stderr)
 memcheck/tests/inlinfosupp               (stderr)
 memcheck/tests/inlinfosuppobj            (stderr)
-memcheck/tests/inltemplate               (stderr)
 memcheck/tests/leak-autofreepool-0       (stderr)
 memcheck/tests/leak-autofreepool-1       (stderr)
 memcheck/tests/leak-autofreepool-2       (stderr)
@@ -51,8 +41,6 @@ memcheck/tests/leak-tree                 (stderr)
 memcheck/tests/leak_cpp_interior         (stderr)
 memcheck/tests/lks                       (stderr)
 memcheck/tests/long_namespace_xml        (stderr)
-memcheck/tests/malloc2                   (stderr)
-memcheck/tests/manuel3                   (stderr)
 memcheck/tests/memalign_args             (stderr)
 memcheck/tests/memccpy1                  (stderr)
 memcheck/tests/memccpy2                  (stderr)
@@ -67,7 +55,6 @@ memcheck/tests/nanoleak_supp             (stderr)
 memcheck/tests/origin1-yes               (stderr)
 memcheck/tests/origin2-not-quite         (stderr)
 memcheck/tests/origin3-no                (stderr)
-memcheck/tests/origin4-many              (stderr)
 memcheck/tests/origin5-bz2               (stderr)
 memcheck/tests/origin6-fp                (stderr)
 memcheck/tests/overlap                   (stderr)
@@ -87,7 +74,6 @@ memcheck/tests/strchr                    (stderr)
 memcheck/tests/supponlyobj               (stderr)
 memcheck/tests/test-plo-no               (stderr)
 memcheck/tests/thread_alloca             (stderr)
-memcheck/tests/threadname                (stderr)
 memcheck/tests/threadname_xml            (stderr)
 memcheck/tests/trivialleak               (stderr)
 memcheck/tests/undef_malloc_args         (stderr)
@@ -98,15 +84,9 @@ memcheck/tests/varinfo4                  (stderr)
 memcheck/tests/varinfo5                  (stderr)
 memcheck/tests/varinfo6                  (stderr)
 memcheck/tests/wcpncpy                   (stderr)
-memcheck/tests/wrap5                     (stdout)
-memcheck/tests/wrap6                     (stdout)
-memcheck/tests/wrap8                     (stdout)
 memcheck/tests/wrapmalloc                (stdout)
 memcheck/tests/wrapmallocstatic          (stdout)
-memcheck/tests/writev1                   (stderr)
 memcheck/tests/xml1                      (stderr)
-cachegrind/tests/wrap5                   (stdout)
-callgrind/tests/bug497723                (post)
 helgrind/tests/annotate_hbefore          (stderr)
 helgrind/tests/annotate_rwlock           (stderr)
 helgrind/tests/annotate_smart_pointer    (stderr)
@@ -337,35 +317,26 @@ none/tests/fdleak_cmsg_supp              (stderr)
 none/tests/fdleak_cmsg_xml               (stderr)
 none/tests/fdleak_creat                  (stderr)
 none/tests/fdleak_creat_sup              (stderr)
-none/tests/fdleak_creat_xml              (stderr)
 none/tests/fdleak_dup                    (stderr)
 none/tests/fdleak_dup2                   (stderr)
-none/tests/fdleak_dup2_xml               (stderr)
-none/tests/fdleak_dup_xml                (stderr)
 none/tests/fdleak_fcntl                  (stderr)
-none/tests/fdleak_fcntl_xml              (stderr)
 none/tests/fdleak_ipv4                   (stderr)
-none/tests/fdleak_ipv4_xml               (stderr)
 none/tests/fdleak_open                   (stderr)
-none/tests/fdleak_open_xml               (stderr)
 none/tests/fdleak_pipe                   (stderr)
-none/tests/fdleak_pipe_xml               (stderr)
 none/tests/fdleak_socketpair             (stderr)
-none/tests/fdleak_socketpair_xml         (stderr)
 none/tests/file_dclose                   (stderr)
 none/tests/file_dclose_sup               (stderr)
-none/tests/file_dclose_xml               (stderr)
 none/tests/ioctl_moans                   (stderr)
 none/tests/map_unmap                     (stdout)
 none/tests/map_unmap                     (stderr)
+none/tests/mmap_fcntl_bug                (stderr)
 none/tests/nocwd                         (stdout)
 none/tests/nocwd                         (stderr)
 none/tests/require-text-symbol-2         (stderr)
 none/tests/scripts/shell                 (stderr)
 none/tests/sigstackgrowth                (stdout)
 none/tests/sigstackgrowth                (stderr)
 none/tests/socket_close                  (stderr)
-none/tests/socket_close_xml              (stderr)
 none/tests/stackgrowth                   (stdout)
 none/tests/stackgrowth                   (stderr)
 none/tests/syscall-restart1              (stderr)

.github/macos-14-expected.txt

@@ -383,7 +383,6 @@ none/tests/fdleak_fcntl_xml              (stderr)
 none/tests/fdleak_ipv4                   (stderr)
 none/tests/fdleak_ipv4_xml               (stderr)
 none/tests/fdleak_open                   (stderr)
-none/tests/fdleak_open_xml               (stderr)
 none/tests/fdleak_pipe                   (stderr)
 none/tests/fdleak_pipe_xml               (stderr)
 none/tests/fdleak_socketpair             (stderr)
@@ -396,6 +395,7 @@ none/tests/libvex_test                   (stderr)
 none/tests/libvexmultiarch_test          (stderr)
 none/tests/map_unmap                     (stdout)
 none/tests/map_unmap                     (stderr)
+none/tests/mmap_fcntl_bug                (stderr)
 none/tests/nocwd                         (stdout)
 none/tests/nocwd                         (stderr)
 none/tests/require-text-symbol-2         (stderr)

NEWS

@@ -55,11 +55,14 @@ are not entered into bugzilla tend to get forgotten about or ignored.
         even though it's generated by --gen-suppressions=yes
 498422  s390x: Fix VLRL and VSTRL insns
 498492  none/tests/amd64/lzcnt64 crashes on FreeBSD compiled with clang
+498942  s390x: Rework s390_disasm interface
 499183  FreeBSD: differences in avx-vmovq output
 499212  mmap() with MAP_ALIGNED() returns unaligned pointer
 501119  memcheck/tests/pointer-trace fails when run on NFS filesystem
 501194  Fix ML_(check_macho_and_get_rw_loads) so that it is correct for any number of segment commands
-501348 glibc built with -march=x86-64-v3 does not work due to ld.so memcmp
+501348  glibc built with -march=x86-64-v3 does not work due to ld.so memcmp
+501479  Illumos DRD pthread_mutex_init wrapper errors
+501365  syscall userfaultfd not wrapped
 
 
 To see details of a given bug, visit

VEX/priv/guest_s390_defs.h

@@ -34,6 +34,7 @@
 #include "libvex_basictypes.h"        // offsetof
 #include "guest_generic_bb_to_IR.h"   // DisResult
 #include "libvex_guest_s390x.h"       // VexGuestS390XState
+#include "main_util.h"                // STATIC_ASSERT
 
 
 /* Convert one s390 insn to IR.  See the type DisOneInstrFn in