From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Thu, 24 Aug 2023 19:06:23 +0000 (+0200)
Subject: regtest: fix wrong interfaces in calls to operator delete
X-Git-Tag: VALGRIND_3_22_0~119
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae53295e6a400b5f434ff1047d39c56114747818;p=thirdparty%2Fvalgrind.git

regtest: fix wrong interfaces in calls to operator delete

Will update Solaris later
---

diff --git a/memcheck/tests/cxx17_aligned_new.cpp b/memcheck/tests/cxx17_aligned_new.cpp
index 6f574d066f..1a7ac3c299 100644
--- a/memcheck/tests/cxx17_aligned_new.cpp
+++ b/memcheck/tests/cxx17_aligned_new.cpp
@@ -28,10 +28,16 @@ int main() {
     operator delete [](myClass5, 320U, std::align_val_t(64U));
 
     MyClass* myClassNt = new (std::nothrow) MyClass;
-    operator delete(myClassNt, std::align_val_t(64U),  std::nothrow);
+    operator delete(myClassNt, std::align_val_t(64U));
 
     MyClass* myClass5Nt = new (std::nothrow) MyClass[5];
-    operator delete [](myClass5Nt, std::align_val_t(64U), std::nothrow);
+    operator delete [](myClass5Nt, std::align_val_t(64U));
+
+    myClassNt = new (std::nothrow) MyClass;
+    operator delete(myClassNt, sizeof(MyClass), std::align_val_t(64U));
+
+    myClass5Nt = new (std::nothrow) MyClass[5];
+    operator delete [](myClass5Nt, sizeof(MyClass)*5, std::align_val_t(64U));
 
     OrdinaryClass* oClass = new OrdinaryClass;
     // this is a limitation, VG does not use enough bits
@@ -48,4 +54,3 @@ int main() {
     oClass = new (std::nothrow) OrdinaryClass[5];
     delete [] oClass;
 }
-
diff --git a/memcheck/tests/cxx17_aligned_new.stderr.exp b/memcheck/tests/cxx17_aligned_new.stderr.exp
index 1c08b82f90..cf52836c69 100644
--- a/memcheck/tests/cxx17_aligned_new.stderr.exp
+++ b/memcheck/tests/cxx17_aligned_new.stderr.exp
@@ -8,9 +8,13 @@ _ZdlPvmSt11align_val_t(0x........)
 _ZnamSt11align_val_t(size 320, al 64) = 0x........
 _ZdaPvmSt11align_val_t(0x........)
 _ZnwmSt11align_val_tRKSt9nothrow_t(size 64, al 64) = 0x........
-_ZdlPvSt11align_val_tRKSt9nothrow_t(0x........)
+_ZdlPvSt11align_val_t(0x........)
+_ZnamSt11align_val_tRKSt9nothrow_t(size 320, al 64) = 0x........
+_ZdaPvSt11align_val_t(0x........)
+_ZnwmSt11align_val_tRKSt9nothrow_t(size 64, al 64) = 0x........
+_ZdlPvmSt11align_val_t(0x........)
 _ZnamSt11align_val_tRKSt9nothrow_t(size 320, al 64) = 0x........
-_ZdaPvSt11align_val_tRKSt9nothrow_t(0x........)
+_ZdaPvmSt11align_val_t(0x........)
 _Znwm(4) = 0x........
 _ZdlPvSt11align_val_t(0x........)
 _ZnwmRKSt9nothrow_t(4) = 0x........
diff --git a/memcheck/tests/cxx17_aligned_new.stderr.exp_32 b/memcheck/tests/cxx17_aligned_new.stderr.exp_32
index e6d6db40a4..d40deebe81 100644
--- a/memcheck/tests/cxx17_aligned_new.stderr.exp_32
+++ b/memcheck/tests/cxx17_aligned_new.stderr.exp_32
@@ -1,16 +1,20 @@
 
-_ZnwjSt11align_val_t(size 64, al 64) = 0x........
+_Znwj(64) = 0x........
 _ZdlPvSt11align_val_t(0x........)
-_ZnajSt11align_val_t(size 320, al 64) = 0x........
+_Znaj(320) = 0x........
 _ZdaPvSt11align_val_t(0x........)
-_ZnwjSt11align_val_t(size 64, al 64) = 0x........
+_Znwj(64) = 0x........
 _ZdlPvjSt11align_val_t(0x........)
-_ZnajSt11align_val_t(size 320, al 64) = 0x........
+_Znaj(320) = 0x........
+_ZdaPvjSt11align_val_t(0x........)
+_ZnwjRKSt9nothrow_t(64) = 0x........
+_ZdlPvSt11align_val_t(0x........)
+_ZnajRKSt9nothrow_t(320) = 0x........
+_ZdaPvSt11align_val_t(0x........)
+_ZnwjRKSt9nothrow_t(64) = 0x........
+_ZdlPvjSt11align_val_t(0x........)
+_ZnajRKSt9nothrow_t(320) = 0x........
 _ZdaPvjSt11align_val_t(0x........)
-_ZnwjSt11align_val_tRKSt9nothrow_t(size 64, al 64) = 0x........
-_ZdlPvSt11align_val_tRKSt9nothrow_t(0x........)
-_ZnajSt11align_val_tRKSt9nothrow_t(size 320, al 64) = 0x........
-_ZdaPvSt11align_val_tRKSt9nothrow_t(0x........)
 _Znwj(4) = 0x........
 _ZdlPvSt11align_val_t(0x........)
 _ZnwjRKSt9nothrow_t(4) = 0x........