From 410528f093e41d8d8ca5eae37d4bb57c98a3122b Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 15 Mar 2012 15:49:42 +0000 Subject: * cp-valprint.c (cp_print_value_fields): Use print_function_pointer_address for vtable slot. gdb/testsuite * gdb.cp/virtfunc2.exp: Update expected output. * gdb.cp/pr9631.exp: Update expected output. * gdb.cp/member-ptr.exp: Update expected output. * gdb.cp/inherit.exp (test_print_mvi_classes): Update expected output. * gdb.cp/casts.exp: Update expected output. --- gdb/testsuite/gdb.cp/inherit.exp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gdb/testsuite/gdb.cp/inherit.exp') diff --git a/gdb/testsuite/gdb.cp/inherit.exp b/gdb/testsuite/gdb.cp/inherit.exp index 74e758b..7e2e871 100644 --- a/gdb/testsuite/gdb.cp/inherit.exp +++ b/gdb/testsuite/gdb.cp/inherit.exp @@ -670,7 +670,7 @@ proc test_print_mvi_classes { } { # gcc 2.95.3 -gstabs+ pass $name } - -re "$vhn = \{ = \{ = \{va = 19, vx = 20\}, $re_vbptr_3_vB = $hex, vb = 21, vx = 22\}, = \{$re_vbptr_3_vC = $hex, vc = 23, vx = 24\}, $re_vbptr_3_vD = $hex, vd = 25, vx = 26\}$nl$gdb_prompt $" { + -re "$vhn = \{ = \{ = \{va = 19, vx = 20\}, $re_vbptr_3_vB = ${hex}( )?, vb = 21, vx = 22\}, = \{$re_vbptr_3_vC = ${hex}( )?, vc = 23, vx = 24\}, $re_vbptr_3_vD = ${hex}( )?, vd = 25, vx = 26\}$nl$gdb_prompt $" { # gcc 3.3.2 -gdwarf-2 # gcc HEAD 2004-01-21 -gdwarf-2 # gcc HEAD 2004-01-21 -gstabs+ @@ -691,7 +691,7 @@ proc test_print_mvi_classes { } { # gcc 2.95.3 -gstabs+ pass $name } - -re "$vhn = \{ = \{ = \{ = \{va = 0, vx = 0\}, $re_vbptr_3_vB = $hex, vb = 0, vx = 0\}, = \{$re_vbptr_3_vC = $hex, vc = 0, vx = 0\}, $re_vbptr_3_vD = $hex, vd = 0, vx = 0\}, $re_vbptr_3_vE = $hex, ve = 27, vx = 28\}$nl$gdb_prompt $" { + -re "$vhn = \{ = \{ = \{ = \{va = 0, vx = 0\}, $re_vbptr_3_vB = ${hex}( )?, vb = 0, vx = 0\}, = \{$re_vbptr_3_vC = ${hex}( )?, vc = 0, vx = 0\}, $re_vbptr_3_vD = ${hex}( )?, vd = 0, vx = 0\}, $re_vbptr_3_vE = ${hex}( )?, ve = 27, vx = 28\}$nl$gdb_prompt $" { # gcc 3.3.4 -gdwarf-2 # gcc 3.3.4 -gstabs+ # gcc 3.4.1 -gdwarf-2 -- cgit v1.1