Fix compile failure on Linux

Use SizeT rather than size_t
Also make tests quieter with -q

diff --git a/coregrind/m_replacemalloc/vg_replace_malloc.c b/coregrind/m_replacemalloc/vg_replace_malloc.c
index e122371202b5f987689815ff325b45f797326073..2b0879cd86dae3761ea5e7287e91d54b42a0a0c7 100644 (file)
--- a/coregrind/m_replacemalloc/vg_replace_malloc.c
+++ b/coregrind/m_replacemalloc/vg_replace_malloc.c
@@ -932,8 +932,8 @@ extern int *___errno (void) __attribute__((weak));
 
 #define DELETE_SIZED(soname, fnname, vg_replacement) \
    \
-   void VG_REPLACE_FUNCTION_EZU(10050,soname,fnname) (void *p, size_t size); \
-   void VG_REPLACE_FUNCTION_EZU(10050,soname,fnname) (void *p, size_t size)  \
+   void VG_REPLACE_FUNCTION_EZU(10050,soname,fnname) (void *p, SizeT size); \
+   void VG_REPLACE_FUNCTION_EZU(10050,soname,fnname) (void *p, SizeT size)  \
    { \
       DO_INIT; \
       TRIGGER_MEMCHECK_ERROR_IF_UNDEFINED((UWord)size); \
@@ -1008,8 +1008,8 @@ extern int *___errno (void) __attribute__((weak));
 
 #define DELETE_ALIGNED(soname, fnname, vg_replacement) \
    \
-   void VG_REPLACE_FUNCTION_EZU(10050,soname,fnname) (void *p, size_t alignment); \
-   void VG_REPLACE_FUNCTION_EZU(10050,soname,fnname) (void *p, size_t alignment)  \
+   void VG_REPLACE_FUNCTION_EZU(10050,soname,fnname) (void *p, SizeT alignment); \
+   void VG_REPLACE_FUNCTION_EZU(10050,soname,fnname) (void *p, SizeT alignment)  \
    { \
       DO_INIT; \
       TRIGGER_MEMCHECK_ERROR_IF_UNDEFINED((UWord)alignment); \
@@ -1021,8 +1021,8 @@ extern int *___errno (void) __attribute__((weak));
 
 #define DELETE_SIZED_ALIGNED(soname, fnname, vg_replacement) \
    \
-   void VG_REPLACE_FUNCTION_EZU(10050,soname,fnname) (void *p, size_t size, size_t alignment); \
-   void VG_REPLACE_FUNCTION_EZU(10050,soname,fnname) (void *p, size_t size, size_t alignment)  \
+   void VG_REPLACE_FUNCTION_EZU(10050,soname,fnname) (void *p, SizeT size, SizeT alignment); \
+   void VG_REPLACE_FUNCTION_EZU(10050,soname,fnname) (void *p, SizeT size, SizeT alignment)  \
    { \
       DO_INIT; \
       TRIGGER_MEMCHECK_ERROR_IF_UNDEFINED((UWord)size); \

diff --git a/memcheck/tests/sized_aligned_new_delete_args.stderr.exp b/memcheck/tests/sized_aligned_new_delete_args.stderr.exp
index c086f1d2662504936f5aef3250e06d145c5b2efa..a4c30dc4bdd0a67a872a4f5ade5df16667bc5277 100644 (file)
--- a/memcheck/tests/sized_aligned_new_delete_args.stderr.exp
+++ b/memcheck/tests/sized_aligned_new_delete_args.stderr.exp
@@ -1,4 +1,3 @@
-
 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)
@@ -71,13 +70,3 @@ 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)
 
-
-HEAP SUMMARY:
-    in use at exit: 0 bytes in 0 blocks
-  total heap usage: 8 allocs, 8 frees, 128 bytes allocated
-
-For a detailed leak analysis, rerun with: --leak-check=full
-
-Use --track-origins=yes to see where uninitialised values come from
-For lists of detected and suppressed errors, rerun with: -s
-ERROR SUMMARY: 18 errors from 18 contexts (suppressed: 0 from 0)

diff --git a/memcheck/tests/sized_aligned_new_delete_args.stderr.exp_32 b/memcheck/tests/sized_aligned_new_delete_args.stderr.exp_32
index dfa83679ec32699398b2d968305a3c5d90e2e719..9a23649683b354a035fcf9906af9d94f6f581994 100644 (file)
--- a/memcheck/tests/sized_aligned_new_delete_args.stderr.exp_32
+++ b/memcheck/tests/sized_aligned_new_delete_args.stderr.exp_32
@@ -1,4 +1,3 @@
-
 Conditional jump or move depends on uninitialised value(s)
    at 0x........: operator new(unsigned int, std::align_val_t) (vg_replace_malloc.c:...)
    by 0x........: main (sized_aligned_new_delete_args.cpp:16)
@@ -71,13 +70,3 @@ Conditional jump or move depends on uninitialised value(s)
    at 0x........: operator delete[](void*, unsigned int, std::align_val_t) (vg_replace_malloc.c:...)
    by 0x........: main (sized_aligned_new_delete_args.cpp:40)
 
-
-HEAP SUMMARY:
-    in use at exit: 0 bytes in 0 blocks
-  total heap usage: 8 allocs, 8 frees, 128 bytes allocated
-
-For a detailed leak analysis, rerun with: --leak-check=full
-
-Use --track-origins=yes to see where uninitialised values come from
-For lists of detected and suppressed errors, rerun with: -s
-ERROR SUMMARY: 18 errors from 18 contexts (suppressed: 0 from 0)

diff --git a/memcheck/tests/sized_aligned_new_delete_args.vgtest b/memcheck/tests/sized_aligned_new_delete_args.vgtest
index 8df8db4df2b69d9656bf0bcc32b7743d2b0522e8..029fd4b6618fa61e3475dcb54bdad2bc58c7c566 100644 (file)
--- a/memcheck/tests/sized_aligned_new_delete_args.vgtest
+++ b/memcheck/tests/sized_aligned_new_delete_args.vgtest
@@ -1,2 +1,3 @@
 prog: sized_aligned_new_delete_args
 prereq: test -e ./sized_aligned_new_delete_args
+vgopts: -q