From: Paul Floyd Date: Sun, 5 Nov 2023 09:59:43 +0000 (+0100) Subject: massif regtest: make verbose tests work on both 32bit and 64bit X-Git-Tag: VALGRIND_3_23_0~291 X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=d4918ea44ce1e2ed0ba843e8acae0250c56558a3;p=valgrind.git massif regtest: make verbose tests work on both 32bit and 64bit Now alloc fns only have the appropriate new overloads which means 32bit has unsigned size but 64bit has unsigned long. Filter the unsigned long to unsigned. --- diff --git a/massif/tests/culling1.stderr.exp b/massif/tests/culling1.stderr.exp index 6e3820a664..ffc88d6336 100644 --- a/massif/tests/culling1.stderr.exp +++ b/massif/tests/culling1.stderr.exp @@ -1,21 +1,21 @@ Massif: alloc-fns: Massif: malloc Massif: __builtin_new -Massif: operator new(unsigned long) +Massif: operator new(unsigned) Massif: __builtin_vec_new -Massif: operator new[](unsigned long) +Massif: operator new[](unsigned) Massif: calloc Massif: aligned_alloc Massif: realloc Massif: memalign Massif: posix_memalign Massif: valloc -Massif: operator new(unsigned long, std::nothrow_t const&) -Massif: operator new[](unsigned long, std::nothrow_t const&) -Massif: operator new(unsigned long, std::align_val_t) -Massif: operator new[](unsigned long, std::align_val_t) -Massif: operator new(unsigned long, std::align_val_t, std::nothrow_t const&) -Massif: operator new[](unsigned long, std::align_val_t, std::nothrow_t const&) +Massif: operator new(unsigned, std::nothrow_t const&) +Massif: operator new[](unsigned, std::nothrow_t const&) +Massif: operator new(unsigned, std::align_val_t) +Massif: operator new[](unsigned, std::align_val_t) +Massif: operator new(unsigned, std::align_val_t, std::nothrow_t const&) +Massif: operator new[](unsigned, std::align_val_t, std::nothrow_t const&) Massif: ignore-fns: Massif: 0: __part_load_locale Massif: 1: __time_load_locale diff --git a/massif/tests/culling2.stderr.exp b/massif/tests/culling2.stderr.exp index 13f476477b..1d8682fbec 100644 --- a/massif/tests/culling2.stderr.exp +++ b/massif/tests/culling2.stderr.exp @@ -1,21 +1,21 @@ Massif: alloc-fns: Massif: malloc Massif: __builtin_new -Massif: operator new(unsigned long) +Massif: operator new(unsigned) Massif: __builtin_vec_new -Massif: operator new[](unsigned long) +Massif: operator new[](unsigned) Massif: calloc Massif: aligned_alloc Massif: realloc Massif: memalign Massif: posix_memalign Massif: valloc -Massif: operator new(unsigned long, std::nothrow_t const&) -Massif: operator new[](unsigned long, std::nothrow_t const&) -Massif: operator new(unsigned long, std::align_val_t) -Massif: operator new[](unsigned long, std::align_val_t) -Massif: operator new(unsigned long, std::align_val_t, std::nothrow_t const&) -Massif: operator new[](unsigned long, std::align_val_t, std::nothrow_t const&) +Massif: operator new(unsigned, std::nothrow_t const&) +Massif: operator new[](unsigned, std::nothrow_t const&) +Massif: operator new(unsigned, std::align_val_t) +Massif: operator new[](unsigned, std::align_val_t) +Massif: operator new(unsigned, std::align_val_t, std::nothrow_t const&) +Massif: operator new[](unsigned, std::align_val_t, std::nothrow_t const&) Massif: ignore-fns: Massif: 0: __part_load_locale Massif: 1: __time_load_locale diff --git a/massif/tests/deep-B.stderr.exp b/massif/tests/deep-B.stderr.exp index 6186969b37..e1f714d9f1 100644 --- a/massif/tests/deep-B.stderr.exp +++ b/massif/tests/deep-B.stderr.exp @@ -1,21 +1,21 @@ Massif: alloc-fns: Massif: malloc Massif: __builtin_new -Massif: operator new(unsigned long) +Massif: operator new(unsigned) Massif: __builtin_vec_new -Massif: operator new[](unsigned long) +Massif: operator new[](unsigned) Massif: calloc Massif: aligned_alloc Massif: realloc Massif: memalign Massif: posix_memalign Massif: valloc -Massif: operator new(unsigned long, std::nothrow_t const&) -Massif: operator new[](unsigned long, std::nothrow_t const&) -Massif: operator new(unsigned long, std::align_val_t) -Massif: operator new[](unsigned long, std::align_val_t) -Massif: operator new(unsigned long, std::align_val_t, std::nothrow_t const&) -Massif: operator new[](unsigned long, std::align_val_t, std::nothrow_t const&) +Massif: operator new(unsigned, std::nothrow_t const&) +Massif: operator new[](unsigned, std::nothrow_t const&) +Massif: operator new(unsigned, std::align_val_t) +Massif: operator new[](unsigned, std::align_val_t) +Massif: operator new(unsigned, std::align_val_t, std::nothrow_t const&) +Massif: operator new[](unsigned, std::align_val_t, std::nothrow_t const&) Massif: a6 Massif: a7 Massif: a8 diff --git a/massif/tests/deep-C.stderr.exp b/massif/tests/deep-C.stderr.exp index 326f4c7f1a..34d65d5ad4 100644 --- a/massif/tests/deep-C.stderr.exp +++ b/massif/tests/deep-C.stderr.exp @@ -1,21 +1,21 @@ Massif: alloc-fns: Massif: malloc Massif: __builtin_new -Massif: operator new(unsigned long) +Massif: operator new(unsigned) Massif: __builtin_vec_new -Massif: operator new[](unsigned long) +Massif: operator new[](unsigned) Massif: calloc Massif: aligned_alloc Massif: realloc Massif: memalign Massif: posix_memalign Massif: valloc -Massif: operator new(unsigned long, std::nothrow_t const&) -Massif: operator new[](unsigned long, std::nothrow_t const&) -Massif: operator new(unsigned long, std::align_val_t) -Massif: operator new[](unsigned long, std::align_val_t) -Massif: operator new(unsigned long, std::align_val_t, std::nothrow_t const&) -Massif: operator new[](unsigned long, std::align_val_t, std::nothrow_t const&) +Massif: operator new(unsigned, std::nothrow_t const&) +Massif: operator new[](unsigned, std::nothrow_t const&) +Massif: operator new(unsigned, std::align_val_t) +Massif: operator new[](unsigned, std::align_val_t) +Massif: operator new(unsigned, std::align_val_t, std::nothrow_t const&) +Massif: operator new[](unsigned, std::align_val_t, std::nothrow_t const&) Massif: a3 Massif: a4 Massif: a5 diff --git a/massif/tests/filter_verbose b/massif/tests/filter_verbose index 745b521ea6..d992e653f5 100755 --- a/massif/tests/filter_verbose +++ b/massif/tests/filter_verbose @@ -28,4 +28,8 @@ sed "s/\(Massif: XPt init expansions:\).*/\1 .../" | sed "s/\(Massif: XPt later expansions:\).*/\1 .../" | sed "s/\(Massif: SXPt allocs:\).*/\1 .../" | sed "s/\(Massif: SXPt frees:\).*/\1 .../" | -sed "s/\(Massif: XCon redos:\).*/\1 .../" +sed "s/\(Massif: XCon redos:\).*/\1 .../" | +sed "s/Massif: operator new(unsigned long/Massif: operator new(unsigned/" | +sed "s/Massif: operator new\[\](unsigned long/Massif: operator new\[\](unsigned/" + + diff --git a/massif/tests/peak2.stderr.exp b/massif/tests/peak2.stderr.exp index 2e14091303..fc93effbbd 100644 --- a/massif/tests/peak2.stderr.exp +++ b/massif/tests/peak2.stderr.exp @@ -1,21 +1,21 @@ Massif: alloc-fns: Massif: malloc Massif: __builtin_new -Massif: operator new(unsigned long) +Massif: operator new(unsigned) Massif: __builtin_vec_new -Massif: operator new[](unsigned long) +Massif: operator new[](unsigned) Massif: calloc Massif: aligned_alloc Massif: realloc Massif: memalign Massif: posix_memalign Massif: valloc -Massif: operator new(unsigned long, std::nothrow_t const&) -Massif: operator new[](unsigned long, std::nothrow_t const&) -Massif: operator new(unsigned long, std::align_val_t) -Massif: operator new[](unsigned long, std::align_val_t) -Massif: operator new(unsigned long, std::align_val_t, std::nothrow_t const&) -Massif: operator new[](unsigned long, std::align_val_t, std::nothrow_t const&) +Massif: operator new(unsigned, std::nothrow_t const&) +Massif: operator new[](unsigned, std::nothrow_t const&) +Massif: operator new(unsigned, std::align_val_t) +Massif: operator new[](unsigned, std::align_val_t) +Massif: operator new(unsigned, std::align_val_t, std::nothrow_t const&) +Massif: operator new[](unsigned, std::align_val_t, std::nothrow_t const&) Massif: ignore-fns: Massif: 0: __part_load_locale Massif: 1: __time_load_locale diff --git a/massif/tests/realloc.stderr.exp b/massif/tests/realloc.stderr.exp index 780d0826bb..cb4a016a30 100644 --- a/massif/tests/realloc.stderr.exp +++ b/massif/tests/realloc.stderr.exp @@ -1,21 +1,21 @@ Massif: alloc-fns: Massif: malloc Massif: __builtin_new -Massif: operator new(unsigned long) +Massif: operator new(unsigned) Massif: __builtin_vec_new -Massif: operator new[](unsigned long) +Massif: operator new[](unsigned) Massif: calloc Massif: aligned_alloc Massif: realloc Massif: memalign Massif: posix_memalign Massif: valloc -Massif: operator new(unsigned long, std::nothrow_t const&) -Massif: operator new[](unsigned long, std::nothrow_t const&) -Massif: operator new(unsigned long, std::align_val_t) -Massif: operator new[](unsigned long, std::align_val_t) -Massif: operator new(unsigned long, std::align_val_t, std::nothrow_t const&) -Massif: operator new[](unsigned long, std::align_val_t, std::nothrow_t const&) +Massif: operator new(unsigned, std::nothrow_t const&) +Massif: operator new[](unsigned, std::nothrow_t const&) +Massif: operator new(unsigned, std::align_val_t) +Massif: operator new[](unsigned, std::align_val_t) +Massif: operator new(unsigned, std::align_val_t, std::nothrow_t const&) +Massif: operator new[](unsigned, std::align_val_t, std::nothrow_t const&) Massif: ignore-fns: Massif: 0: __part_load_locale Massif: 1: __time_load_locale