From f1fe1d35c855b9abaf1fb0a347e5de2e12994b1a Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Fri, 10 May 2024 16:33:20 -0400 Subject: [PATCH] Adjust C++ destructor type tests In gcc-15-95-ga12cae97390 I dropped the unnecessary artificial "in-charge" parameter from destructors of classes with no virtual bases; Linaro's CI informed me that the gdb testsuite needs to be adjusted to match. Teested against GCC 13.2 and GCC 15 trunk. Approved-by: Kevin Buettner --- gdb/testsuite/gdb.cp/m-static.exp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gdb/testsuite/gdb.cp/m-static.exp b/gdb/testsuite/gdb.cp/m-static.exp index 19eb70b7d71..45bc090d01f 100644 --- a/gdb/testsuite/gdb.cp/m-static.exp +++ b/gdb/testsuite/gdb.cp/m-static.exp @@ -79,14 +79,14 @@ if { [is_aarch32_target] } { "simple object class, ptype constructor" gdb_test "print test1.~gnu_obj_1" \ - { = {void \*\(gnu_obj_1 \* const, int\)} 0x[0-9a-f]+ } \ + { = {void \*\(gnu_obj_1 \* const(, int)?\)} 0x[0-9a-f]+ } \ "simple object instance, print destructor" gdb_test "ptype test1.~gnu_obj_1" \ - {type = void \*\(gnu_obj_1 \* const, int\)} \ + {type = void \*\(gnu_obj_1 \* const(, int)?\)} \ "simple object instance, ptype destructor" gdb_test "print test1.'~gnu_obj_1'" \ - { = {void \*\(gnu_obj_1 \*( const)?, int\)} 0x[0-9a-f]+ } \ + { = {void \*\(gnu_obj_1 \*( const)?(, int)?\)} 0x[0-9a-f]+ } \ "simple object instance, print quoted destructor" gdb_test "ptype gnu_obj_1::'~gnu_obj_1'" \ -- 2.39.5