regtest: fix warning in memalign_args and add debug info to sized_aligned_new_delete_args

diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index e6afff0d00502c3231a7bdd168d6f51aac070ee2..72d56cfa4897816ce125433add8d7095015bd583 100644 (file)
--- 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 aadae8d9f0d8c8a11dfedcb2a94f6516ce6b21ff..0946a6ce98844b45e4bab61e3cf7d3feec5e9e4b 100644 (file)
--- 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 9cf48891d6c8ee55ef8fd931b5618399c0b3f779..65e6122005933a158e55fbeb2d1bae3784566124 100644 (file)
--- 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 d03b1968264cea719b4944a5e017a053da39b7f6..0261a8b930b908de858468827d07ed961c570e3c 100644 (file)
--- 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 72125a1fbca4d827aaa2ccda63f37b744b163a27..2e289e86e76845337bb100528a1835ae43ff4ba1 100644 (file)
--- 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 a4c30dc4bdd0a67a872a4f5ade5df16667bc5277..27047ef8100e25a17383a2c11c86a4d108de51d0 100644 (file)
--- 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)