|
From: Paul F. <pa...@so...> - 2023-03-08 08:00:54
|
https://sourceware.org/git/gitweb.cgi?p=valgrind.git;h=a7d86da0f6f35e0f613158a5be9d2c0f741b36ae commit a7d86da0f6f35e0f613158a5be9d2c0f741b36ae Author: Paul Floyd <pj...@wa...> Date: Wed Mar 8 08:59:38 2023 +0100 regtest: fix warning in memalign_args and add debug info to sized_aligned_new_delete_args Diff: --- memcheck/tests/Makefile.am | 2 +- memcheck/tests/memalign_args.c | 3 ++ memcheck/tests/memalign_args.stderr.exp | 16 ++++----- memcheck/tests/memalign_args.stderr.exp-glibc | 16 ++++----- memcheck/tests/memalign_args.stderr.exp-ppc64 | 22 +++++-------- .../tests/sized_aligned_new_delete_args.stderr.exp | 38 ++++++++++------------ 6 files changed, 46 insertions(+), 51 deletions(-) diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am index e6afff0d00..72d56cfa48 100644 --- a/memcheck/tests/Makefile.am +++ b/memcheck/tests/Makefile.am @@ -550,7 +550,7 @@ if HAVE_ALIGNED_CXX_ALLOC cxx17_aligned_new_SOURCES = cxx17_aligned_new.cpp cxx17_aligned_new_CXXFLAGS = -std=c++17 @FLAG_W_NO_MISMATCHED_NEW_DELETE@ sized_aligned_new_delete_args_SOURCES = sized_aligned_new_delete_args.cpp -sized_aligned_new_delete_args_CXXFLAGS = -std=c++17 +sized_aligned_new_delete_args_CXXFLAGS = ${AM_CXXFLAGS} -std=c++17 endif demangle_SOURCES = demangle.cpp diff --git a/memcheck/tests/memalign_args.c b/memcheck/tests/memalign_args.c index aadae8d9f0..0946a6ce98 100644 --- a/memcheck/tests/memalign_args.c +++ b/memcheck/tests/memalign_args.c @@ -1,5 +1,8 @@ #include <stdlib.h> #include <unistd.h> +#if !defined(VGO_darwin) +#include <malloc.h> +#endif #include "../../config.h" #include "../memcheck.h" diff --git a/memcheck/tests/memalign_args.stderr.exp b/memcheck/tests/memalign_args.stderr.exp index 9cf48891d6..65e6122005 100644 --- a/memcheck/tests/memalign_args.stderr.exp +++ b/memcheck/tests/memalign_args.stderr.exp @@ -1,32 +1,32 @@ Conditional jump or move depends on uninitialised value(s) at 0x........: memalign (vg_replace_malloc.c:...) - by 0x........: main (memalign_args.c:16) + by 0x........: main (memalign_args.c:19) Conditional jump or move depends on uninitialised value(s) at 0x........: memalign (vg_replace_malloc.c:...) - by 0x........: main (memalign_args.c:16) + by 0x........: main (memalign_args.c:19) Conditional jump or move depends on uninitialised value(s) at 0x........: posix_memalign (vg_replace_malloc.c:...) - by 0x........: main (memalign_args.c:20) + by 0x........: main (memalign_args.c:23) Conditional jump or move depends on uninitialised value(s) at 0x........: posix_memalign (vg_replace_malloc.c:...) - by 0x........: main (memalign_args.c:20) + by 0x........: main (memalign_args.c:23) Conditional jump or move depends on uninitialised value(s) at 0x........: posix_memalign (vg_replace_malloc.c:...) - by 0x........: main (memalign_args.c:20) + by 0x........: main (memalign_args.c:23) Conditional jump or move depends on uninitialised value(s) at 0x........: aligned_alloc (vg_replace_malloc.c:...) - by 0x........: main (memalign_args.c:23) + by 0x........: main (memalign_args.c:26) Conditional jump or move depends on uninitialised value(s) at 0x........: aligned_alloc (vg_replace_malloc.c:...) - by 0x........: main (memalign_args.c:23) + by 0x........: main (memalign_args.c:26) Conditional jump or move depends on uninitialised value(s) at 0x........: valloc (vg_replace_malloc.c:...) - by 0x........: main (memalign_args.c:26) + by 0x........: main (memalign_args.c:29) diff --git a/memcheck/tests/memalign_args.stderr.exp-glibc b/memcheck/tests/memalign_args.stderr.exp-glibc index d03b196826..0261a8b930 100644 --- a/memcheck/tests/memalign_args.stderr.exp-glibc +++ b/memcheck/tests/memalign_args.stderr.exp-glibc @@ -1,32 +1,32 @@ Conditional jump or move depends on uninitialised value(s) at 0x........: memalign (vg_replace_malloc.c:...) - by 0x........: main (memalign_args.c:16) + by 0x........: main (memalign_args.c:19) Conditional jump or move depends on uninitialised value(s) at 0x........: memalign (vg_replace_malloc.c:...) - by 0x........: main (memalign_args.c:16) + by 0x........: main (memalign_args.c:19) Conditional jump or move depends on uninitialised value(s) at 0x........: posix_memalign (vg_replace_malloc.c:...) - by 0x........: main (memalign_args.c:20) + by 0x........: main (memalign_args.c:23) Conditional jump or move depends on uninitialised value(s) at 0x........: posix_memalign (vg_replace_malloc.c:...) - by 0x........: main (memalign_args.c:20) + by 0x........: main (memalign_args.c:23) Conditional jump or move depends on uninitialised value(s) at 0x........: posix_memalign (vg_replace_malloc.c:...) - by 0x........: main (memalign_args.c:20) + by 0x........: main (memalign_args.c:23) Conditional jump or move depends on uninitialised value(s) at 0x........: memalign (vg_replace_malloc.c:...) - by 0x........: main (memalign_args.c:23) + by 0x........: main (memalign_args.c:26) Conditional jump or move depends on uninitialised value(s) at 0x........: memalign (vg_replace_malloc.c:...) - by 0x........: main (memalign_args.c:23) + by 0x........: main (memalign_args.c:26) Conditional jump or move depends on uninitialised value(s) at 0x........: valloc (vg_replace_malloc.c:...) - by 0x........: main (memalign_args.c:26) + by 0x........: main (memalign_args.c:29) diff --git a/memcheck/tests/memalign_args.stderr.exp-ppc64 b/memcheck/tests/memalign_args.stderr.exp-ppc64 index 72125a1fbc..2e289e86e7 100644 --- a/memcheck/tests/memalign_args.stderr.exp-ppc64 +++ b/memcheck/tests/memalign_args.stderr.exp-ppc64 @@ -1,34 +1,30 @@ Conditional jump or move depends on uninitialised value(s) at 0x........: memalign (vg_replace_malloc.c:...) - by 0x........: main (memalign_args.c:16) + by 0x........: main (memalign_args.c:19) Conditional jump or move depends on uninitialised value(s) at 0x........: memalign (vg_replace_malloc.c:...) - by 0x........: main (memalign_args.c:16) - -Conditional jump or move depends on uninitialised value(s) - at 0x........: memalign (vg_replace_malloc.c:...) - by 0x........: main (memalign_args.c:16) + by 0x........: main (memalign_args.c:19) Conditional jump or move depends on uninitialised value(s) at 0x........: posix_memalign (vg_replace_malloc.c:...) - by 0x........: main (memalign_args.c:20) + by 0x........: main (memalign_args.c:23) Conditional jump or move depends on uninitialised value(s) at 0x........: posix_memalign (vg_replace_malloc.c:...) - by 0x........: main (memalign_args.c:20) + by 0x........: main (memalign_args.c:23) Conditional jump or move depends on uninitialised value(s) at 0x........: posix_memalign (vg_replace_malloc.c:...) - by 0x........: main (memalign_args.c:20) + by 0x........: main (memalign_args.c:23) Conditional jump or move depends on uninitialised value(s) at 0x........: posix_memalign (vg_replace_malloc.c:...) - by 0x........: main (memalign_args.c:20) + by 0x........: main (memalign_args.c:23) Conditional jump or move depends on uninitialised value(s) at 0x........: memalign (vg_replace_malloc.c:...) - by 0x........: main (memalign_args.c:23) + by 0x........: main (memalign_args.c:26) Conditional jump or move depends on uninitialised value(s) at 0x........: memalign (vg_replace_malloc.c:...) @@ -36,9 +32,9 @@ Conditional jump or move depends on uninitialised value(s) Conditional jump or move depends on uninitialised value(s) at 0x........: memalign (vg_replace_malloc.c:...) - by 0x........: main (memalign_args.c:23) + by 0x........: main (memalign_args.c:26) Conditional jump or move depends on uninitialised value(s) at 0x........: valloc (vg_replace_malloc.c:...) - by 0x........: main (memalign_args.c:26) + by 0x........: main (memalign_args.c:29) diff --git a/memcheck/tests/sized_aligned_new_delete_args.stderr.exp b/memcheck/tests/sized_aligned_new_delete_args.stderr.exp index a4c30dc4bd..27047ef810 100644 --- a/memcheck/tests/sized_aligned_new_delete_args.stderr.exp +++ b/memcheck/tests/sized_aligned_new_delete_args.stderr.exp @@ -1,72 +1,68 @@ Conditional jump or move depends on uninitialised value(s) at 0x........: operator new(unsigned long, std::align_val_t) (vg_replace_malloc.c:...) - by 0x........: main (in /usr/home/paulf/scratch/valgrind/memcheck/tests/sized_aligned_new_delete_args) + by 0x........: main (sized_aligned_new_delete_args.cpp:16) Conditional jump or move depends on uninitialised value(s) at 0x........: operator new(unsigned long, std::align_val_t) (vg_replace_malloc.c:...) - by 0x........: main (in /usr/home/paulf/scratch/valgrind/memcheck/tests/sized_aligned_new_delete_args) - -Conditional jump or move depends on uninitialised value(s) - at 0x........: operator delete(void*, std::align_val_t) (vg_replace_malloc.c:...) - by 0x........: main (in /usr/home/paulf/scratch/valgrind/memcheck/tests/sized_aligned_new_delete_args) + by 0x........: main (sized_aligned_new_delete_args.cpp:16) Conditional jump or move depends on uninitialised value(s) at 0x........: operator new[](unsigned long, std::align_val_t) (vg_replace_malloc.c:...) - by 0x........: main (in /usr/home/paulf/scratch/valgrind/memcheck/tests/sized_aligned_new_delete_args) + by 0x........: main (sized_aligned_new_delete_args.cpp:19) Conditional jump or move depends on uninitialised value(s) at 0x........: operator new[](unsigned long, std::align_val_t) (vg_replace_malloc.c:...) - by 0x........: main (in /usr/home/paulf/scratch/valgrind/memcheck/tests/sized_aligned_new_delete_args) + by 0x........: main (sized_aligned_new_delete_args.cpp:19) Conditional jump or move depends on uninitialised value(s) at 0x........: operator delete[](void*, std::align_val_t) (vg_replace_malloc.c:...) - by 0x........: main (in /usr/home/paulf/scratch/valgrind/memcheck/tests/sized_aligned_new_delete_args) + by 0x........: main (sized_aligned_new_delete_args.cpp:20) Conditional jump or move depends on uninitialised value(s) at 0x........: operator new(unsigned long, std::align_val_t, std::nothrow_t const&) (vg_replace_malloc.c:...) - by 0x........: main (in /usr/home/paulf/scratch/valgrind/memcheck/tests/sized_aligned_new_delete_args) + by 0x........: main (sized_aligned_new_delete_args.cpp:24) Conditional jump or move depends on uninitialised value(s) at 0x........: operator new(unsigned long, std::align_val_t, std::nothrow_t const&) (vg_replace_malloc.c:...) - by 0x........: main (in /usr/home/paulf/scratch/valgrind/memcheck/tests/sized_aligned_new_delete_args) + by 0x........: main (sized_aligned_new_delete_args.cpp:24) Conditional jump or move depends on uninitialised value(s) at 0x........: operator delete(void*, std::align_val_t, std::nothrow_t const&) (vg_replace_malloc.c:...) - by 0x........: main (in /usr/home/paulf/scratch/valgrind/memcheck/tests/sized_aligned_new_delete_args) + by 0x........: main (sized_aligned_new_delete_args.cpp:25) Conditional jump or move depends on uninitialised value(s) at 0x........: operator new[](unsigned long, std::align_val_t, std::nothrow_t const&) (vg_replace_malloc.c:...) - by 0x........: main (in /usr/home/paulf/scratch/valgrind/memcheck/tests/sized_aligned_new_delete_args) + by 0x........: main (sized_aligned_new_delete_args.cpp:27) Conditional jump or move depends on uninitialised value(s) at 0x........: operator new[](unsigned long, std::align_val_t, std::nothrow_t const&) (vg_replace_malloc.c:...) - by 0x........: main (in /usr/home/paulf/scratch/valgrind/memcheck/tests/sized_aligned_new_delete_args) + by 0x........: main (sized_aligned_new_delete_args.cpp:27) Conditional jump or move depends on uninitialised value(s) at 0x........: operator delete[](void*, std::align_val_t, std::nothrow_t const&) (vg_replace_malloc.c:...) - by 0x........: main (in /usr/home/paulf/scratch/valgrind/memcheck/tests/sized_aligned_new_delete_args) + by 0x........: main (sized_aligned_new_delete_args.cpp:28) Conditional jump or move depends on uninitialised value(s) at 0x........: ...operator delete... (vg_replace_malloc.c:...) - by 0x........: main (in /usr/home/paulf/scratch/valgrind/memcheck/tests/sized_aligned_new_delete_args) + by 0x........: main (sized_aligned_new_delete_args.cpp:31) Conditional jump or move depends on uninitialised value(s) at 0x........: operator delete[](void*, unsigned long) (vg_replace_malloc.c:...) - by 0x........: main (in /usr/home/paulf/scratch/valgrind/memcheck/tests/sized_aligned_new_delete_args) + by 0x........: main (sized_aligned_new_delete_args.cpp:34) Conditional jump or move depends on uninitialised value(s) at 0x........: operator delete(void*, unsigned long, std::align_val_t) (vg_replace_malloc.c:...) - by 0x........: main (in /usr/home/paulf/scratch/valgrind/memcheck/tests/sized_aligned_new_delete_args) + by 0x........: main (sized_aligned_new_delete_args.cpp:37) Conditional jump or move depends on uninitialised value(s) at 0x........: operator delete(void*, unsigned long, std::align_val_t) (vg_replace_malloc.c:...) - by 0x........: main (in /usr/home/paulf/scratch/valgrind/memcheck/tests/sized_aligned_new_delete_args) + by 0x........: main (sized_aligned_new_delete_args.cpp:37) Conditional jump or move depends on uninitialised value(s) at 0x........: operator delete[](void*, unsigned long, std::align_val_t) (vg_replace_malloc.c:...) - by 0x........: main (in /usr/home/paulf/scratch/valgrind/memcheck/tests/sized_aligned_new_delete_args) + by 0x........: main (sized_aligned_new_delete_args.cpp:40) Conditional jump or move depends on uninitialised value(s) at 0x........: operator delete[](void*, unsigned long, std::align_val_t) (vg_replace_malloc.c:...) - by 0x........: main (in /usr/home/paulf/scratch/valgrind/memcheck/tests/sized_aligned_new_delete_args) + by 0x........: main (sized_aligned_new_delete_args.cpp:40) |