From a7fe6b1da0f985af8039c166e97c47c42b9c29e3 Mon Sep 17 00:00:00 2001 From: Paul Floyd Date: Tue, 10 Oct 2023 21:24:01 +0200 Subject: [PATCH] memcheck: Fix a typo in aligned alloc error suppression check Also update corresponding testcase --- memcheck/mc_errors.c | 2 +- .../sized_aligned_new_delete_misaligned1.cpp | 2 +- ...ned_new_delete_misaligned1_supp.stderr.exp | 20 +++++--- ..._new_delete_misaligned1_supp.stderr.exp_32 | 20 +++++--- ...d_aligned_new_delete_misaligned1_supp.supp | 49 ++++++++----------- 5 files changed, 47 insertions(+), 46 deletions(-) diff --git a/memcheck/mc_errors.c b/memcheck/mc_errors.c index 2195cfbe53..5b83c69e50 100644 --- a/memcheck/mc_errors.c +++ b/memcheck/mc_errors.c @@ -1792,7 +1792,7 @@ Bool MC_(error_matches_suppression) ( const Error* err, const Supp* su ) return (ekind == Err_SizeMismatch); case AlignMismatch: - return (ekind = Err_AlignMismatch); + return (ekind == Err_AlignMismatch); default: VG_(printf)("Error:\n" diff --git a/memcheck/tests/sized_aligned_new_delete_misaligned1.cpp b/memcheck/tests/sized_aligned_new_delete_misaligned1.cpp index b0e0d0c26b..f4383a47cf 100644 --- a/memcheck/tests/sized_aligned_new_delete_misaligned1.cpp +++ b/memcheck/tests/sized_aligned_new_delete_misaligned1.cpp @@ -54,5 +54,5 @@ int main() { // initially this test had two throwing // versions called from fork()s // but that doesn't mix well with xml - // so they have split out int vrsions 2 and 3 + // so they have split out int versions 2 and 3 } diff --git a/memcheck/tests/sized_aligned_new_delete_misaligned1_supp.stderr.exp b/memcheck/tests/sized_aligned_new_delete_misaligned1_supp.stderr.exp index 6665e66ea6..a9c23a8294 100644 --- a/memcheck/tests/sized_aligned_new_delete_misaligned1_supp.stderr.exp +++ b/memcheck/tests/sized_aligned_new_delete_misaligned1_supp.stderr.exp @@ -1,8 +1,12 @@ -used_suppression: 2 array new/delete aligned alignment mismatch sized_aligned_new_delete_misaligned1_supp.supp:93 -used_suppression: 2 scalar new/delete aligned alignment mismatch sized_aligned_new_delete_misaligned1_supp.supp:79 -used_suppression: 1 array delete nothrow aligned bad alignment sized_aligned_new_delete_misaligned1_supp.supp:72 -used_suppression: 1 array new nothrow aligned bad alignment sized_aligned_new_delete_misaligned1_supp.supp:58 -used_suppression: 2 scalar delete nothow bad alignment sized_aligned_new_delete_misaligned1_supp.supp:51 -used_suppression: 2 scalar new nothrow aligned nothrow bad alignment sized_aligned_new_delete_misaligned1_supp.supp:2 -used_suppression: 2 array new/delete aligned alignment mismatch sized_aligned_new_delete_misaligned1_supp.supp:44 -used_suppression: 2 scalar new/delete aligned alignment mismatch sized_aligned_new_delete_misaligned1_supp.supp:23 +used_suppression: 1 array delete sized aligned bad alignment sized_aligned_new_delete_misaligned1_supp.supp:114 +used_suppression: 1 array delete aligned alignment mismatch sized_aligned_new_delete_misaligned1_supp.supp:86 +used_suppression: 1 scalar delete sized aligned bad alignment sized_aligned_new_delete_misaligned1_supp.supp:100 +used_suppression: 1 scalar delete sized aligned alignment mismatch sized_aligned_new_delete_misaligned1_supp.supp:72 +used_suppression: 1 array delete aligned nothrow bad alignment sized_aligned_new_delete_misaligned1_supp.supp:65 +used_suppression: 1 array new aligned nothrow bad alignment sized_aligned_new_delete_misaligned1_supp.supp:51 +used_suppression: 2 scalar delete aligned nothow bad alignment sized_aligned_new_delete_misaligned1_supp.supp:44 +used_suppression: 2 scalar new aligned nothrow bad alignment sized_aligned_new_delete_misaligned1_supp.supp:2 +used_suppression: 1 array delete aligned alignment mismatch sized_aligned_new_delete_misaligned1_supp.supp:37 +used_suppression: 1 array delete aligned bad alignment sized_aligned_new_delete_misaligned1_supp.supp:30 +used_suppression: 1 scalar delete aligned alignment mismatch sized_aligned_new_delete_misaligned1_supp.supp:23 +used_suppression: 1 scalar delete aligned bad alignment sized_aligned_new_delete_misaligned1_supp.supp:16 diff --git a/memcheck/tests/sized_aligned_new_delete_misaligned1_supp.stderr.exp_32 b/memcheck/tests/sized_aligned_new_delete_misaligned1_supp.stderr.exp_32 index f477cbdb51..2b7dec61d8 100644 --- a/memcheck/tests/sized_aligned_new_delete_misaligned1_supp.stderr.exp_32 +++ b/memcheck/tests/sized_aligned_new_delete_misaligned1_supp.stderr.exp_32 @@ -1,8 +1,12 @@ -used_suppression: 2 array new/delete aligned alignment mismatch, 32 bit sized_aligned_new_delete_misaligned1_supp.supp:100 -used_suppression: 2 scalar new/delete aligned alignment mismatch, 32 bit sized_aligned_new_delete_misaligned1_supp.supp:86 -used_suppression: 1 array delete nothrow aligned bad alignment sized_aligned_new_delete_misaligned1_supp.supp:72 -used_suppression: 1 array new nothrow aligned bad alignment, 32 bit sized_aligned_new_delete_misaligned1_supp.supp:65 -used_suppression: 2 scalar delete nothow bad alignment sized_aligned_new_delete_misaligned1_supp.supp:51 -used_suppression: 2 scalar new nothrow aligned nothrow bad alignment, 32 bit sized_aligned_new_delete_misaligned1_supp.supp:9 -used_suppression: 2 array new/delete aligned alignment mismatch sized_aligned_new_delete_misaligned1_supp.supp:44 -used_suppression: 2 scalar new/delete aligned alignment mismatch sized_aligned_new_delete_misaligned1_supp.supp:23 +used_suppression: 1 array delete sized aligned bad alignment, 32bit sized_aligned_new_delete_misaligned1_supp.supp:121 +used_suppression: 1 array delete aligned alignment mismatch, 32 bit sized_aligned_new_delete_misaligned1_supp.supp:93 +used_suppression: 1 scalar delete sized aligned bad alignment, 32 bit sized_aligned_new_delete_misaligned1_supp.supp:107 +used_suppression: 1 scalar delete sized aligned alignment mismatch, 32 bit sized_aligned_new_delete_misaligned1_supp.supp:79 +used_suppression: 1 array delete aligned nothrow bad alignment sized_aligned_new_delete_misaligned1_supp.supp:65 +used_suppression: 1 array new aligned nothrow bad alignment, 32 bit sized_aligned_new_delete_misaligned1_supp.supp:58 +used_suppression: 2 scalar delete aligned nothow bad alignment sized_aligned_new_delete_misaligned1_supp.supp:44 +used_suppression: 2 scalar new aligned nothrow bad alignment, 32 bit sized_aligned_new_delete_misaligned1_supp.supp:9 +used_suppression: 1 array delete aligned alignment mismatch sized_aligned_new_delete_misaligned1_supp.supp:37 +used_suppression: 1 array delete aligned bad alignment sized_aligned_new_delete_misaligned1_supp.supp:30 +used_suppression: 1 scalar delete aligned alignment mismatch sized_aligned_new_delete_misaligned1_supp.supp:23 +used_suppression: 1 scalar delete aligned bad alignment sized_aligned_new_delete_misaligned1_supp.supp:16 diff --git a/memcheck/tests/sized_aligned_new_delete_misaligned1_supp.supp b/memcheck/tests/sized_aligned_new_delete_misaligned1_supp.supp index 8fe3ebca3a..8a51a19077 100644 --- a/memcheck/tests/sized_aligned_new_delete_misaligned1_supp.supp +++ b/memcheck/tests/sized_aligned_new_delete_misaligned1_supp.supp @@ -1,12 +1,12 @@ { - scalar new nothrow aligned nothrow bad alignment + scalar new aligned nothrow bad alignment Memcheck:BadAlign fun:_ZnwmSt11align_val_tRKSt9nothrow_t fun:main } { - scalar new nothrow aligned nothrow bad alignment, 32 bit + scalar new aligned nothrow bad alignment, 32 bit Memcheck:BadAlign fun:_ZnwjSt11align_val_tRKSt9nothrow_t fun:main @@ -20,114 +20,107 @@ } { - scalar new/delete aligned alignment mismatch + scalar delete aligned alignment mismatch Memcheck:AlignMismatch fun:_ZdlPvSt11align_val_t fun:main } { - array delete bad alignment + array delete aligned bad alignment Memcheck:BadAlign fun:_ZdaPvSt11align_val_t fun:main } { - array delete bad alignment, 32 bit - Memcheck:BadAlign - fun:_ZdaPvjSt11align_val_t - fun:main -} - -{ - array new/delete aligned alignment mismatch + array delete aligned alignment mismatch Memcheck:AlignMismatch fun:_ZdaPvSt11align_val_t fun:main } { - scalar delete nothow bad alignment + scalar delete aligned nothow bad alignment Memcheck:BadAlign fun:_ZdlPvSt11align_val_tRKSt9nothrow_t fun:main } { - array new nothrow aligned bad alignment + array new aligned nothrow bad alignment Memcheck:BadAlign fun:_ZnamSt11align_val_tRKSt9nothrow_t fun:main } { - array new nothrow aligned bad alignment, 32 bit + array new aligned nothrow bad alignment, 32 bit Memcheck:BadAlign fun:_ZnajSt11align_val_tRKSt9nothrow_t fun:main } { - array delete nothrow aligned bad alignment + array delete aligned nothrow bad alignment Memcheck:BadAlign fun:_ZdaPvSt11align_val_tRKSt9nothrow_t fun:main } { - scalar new/delete aligned alignment mismatch + scalar delete sized aligned alignment mismatch Memcheck:AlignMismatch fun:_ZdlPvmSt11align_val_t fun:main } { - scalar new/delete aligned alignment mismatch, 32 bit + scalar delete sized aligned alignment mismatch, 32 bit Memcheck:AlignMismatch fun:_ZdlPvjSt11align_val_t fun:main } { - array new/delete aligned alignment mismatch + array delete aligned alignment mismatch Memcheck:AlignMismatch fun:_ZdaPvmSt11align_val_t fun:main } { - array new/delete aligned alignment mismatch, 32 bit + array delete aligned alignment mismatch, 32 bit Memcheck:AlignMismatch fun:_ZdaPvjSt11align_val_t fun:main } { - scalar new aligned bad alignment + scalar delete sized aligned bad alignment Memcheck:BadAlign - fun:_ZnwmSt11align_val_t + fun:_ZdlPvmSt11align_val_t fun:main } { - scalar new aligned bad alignment, 32 bit + scalar delete sized aligned bad alignment, 32 bit Memcheck:BadAlign - fun:_ZnwjSt11align_val_t + fun:_ZdlPvjSt11align_val_t fun:main } { - array new aligned bad alignment + array delete sized aligned bad alignment Memcheck:BadAlign - fun:_ZnamSt11align_val_t + fun:_ZdaPvmSt11align_val_t fun:main } { - array new aligned bad alignment, 32bit + array delete sized aligned bad alignment, 32bit Memcheck:BadAlign - fun:_ZnajSt11align_val_t + fun:_ZdaPvjSt11align_val_t fun:main } -- 2.47.2