From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Tue, 2 Mar 2021 16:48:14 +0000 (+0100)
Subject: Modify cxx17_aligned_new testcase to accommdate clang.
X-Git-Tag: VALGRIND_3_17_0~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9ee4517a09753a7ea9f552cde1737113cad6e5f;p=thirdparty%2Fvalgrind.git

Modify cxx17_aligned_new testcase to accommdate clang.

Explicitly use ordinary scalar delete and update the expecteds.
Otherwise g++ uses sized scalar delete whilse clang uses
ordinary scalar delete which causes a diff.
---

diff --git a/memcheck/tests/cxx17_aligned_new.cpp b/memcheck/tests/cxx17_aligned_new.cpp
index ad5dae866b..6f574d066f 100644
--- a/memcheck/tests/cxx17_aligned_new.cpp
+++ b/memcheck/tests/cxx17_aligned_new.cpp
@@ -39,7 +39,10 @@ int main() {
     // so new/aligned delete is not a mismatch
     operator delete(oClass, std::align_val_t(64U));
     oClass = new (std::nothrow) OrdinaryClass;
-    delete oClass;
+    //delete oClass;
+    // changed the above delete because GCC generates
+    // a sized delete (???) whilst clang generates an ordinary delete
+    operator delete(oClass);
     oClass = new OrdinaryClass[5];
     delete [] oClass;
     oClass = new (std::nothrow) OrdinaryClass[5];
diff --git a/memcheck/tests/cxx17_aligned_new.stderr.exp b/memcheck/tests/cxx17_aligned_new.stderr.exp
index 54659a4dba..1c08b82f90 100644
--- a/memcheck/tests/cxx17_aligned_new.stderr.exp
+++ b/memcheck/tests/cxx17_aligned_new.stderr.exp
@@ -14,7 +14,7 @@ _ZdaPvSt11align_val_tRKSt9nothrow_t(0x........)
 _Znwm(4) = 0x........
 _ZdlPvSt11align_val_t(0x........)
 _ZnwmRKSt9nothrow_t(4) = 0x........
-_ZdlPvm(0x........)
+_ZdlPv(0x........)
 _Znam(20) = 0x........
 _ZdaPv(0x........)
 _ZnamRKSt9nothrow_t(20) = 0x........
diff --git a/memcheck/tests/cxx17_aligned_new.stderr.exp_32 b/memcheck/tests/cxx17_aligned_new.stderr.exp_32
index 22fe31f50c..e6d6db40a4 100644
--- a/memcheck/tests/cxx17_aligned_new.stderr.exp_32
+++ b/memcheck/tests/cxx17_aligned_new.stderr.exp_32
@@ -14,7 +14,7 @@ _ZdaPvSt11align_val_tRKSt9nothrow_t(0x........)
 _Znwj(4) = 0x........
 _ZdlPvSt11align_val_t(0x........)
 _ZnwjRKSt9nothrow_t(4) = 0x........
-_ZdlPvj(0x........)
+_ZdlPv(0x........)
 _Znaj(20) = 0x........
 _ZdaPv(0x........)
 _ZnajRKSt9nothrow_t(20) = 0x........