FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix regression in pointer-to-member printing

Browse source 
PR c++/29243 points out that "info func" on a certain C++ executable
will cause an infinite loop in gdb.

I tracked this down to a bug introduced by commit 6b5a7bc76 ("Handle
member pointers directly in generic_value_print").  Before this
commit, the C++ code to print a member pointer would wind up calling
value_print_scalar_formatted; but afterward it simply calls
generic_value_print and gets into a loop.

This patch restores the previous behavior and adds a regression test.
This commit is contained in:
Tom Tromey 2022-10-18 11:32:52 -06:00
parent 1bf074fb6b
commit 8643049733
3 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gdb/testsuite/gdb.cp/member-ptr.cc
View file

@ -142,6 +142,11 @@ int Diamond::vget_base ()
return this->Left::x + 2000;
}
struct Container
{
PMI member;
};
int
func (int x)
{
@ -205,6 +210,9 @@ int main ()
null_pmi = NULL;
null_pmf = NULL;
Container contain;
contain.member = &A::j;
pmi = NULL; /* Breakpoint 1 here. */
(diamond.*diamond_pfunc_ptr) (20);

4
gdb/testsuite/gdb.cp/member-ptr.exp
View file

@ -628,3 +628,7 @@ gdb_test "print null_pmi = 0" "$vhn = NULL"
gdb_test "print null_pmf" "$vhn = NULL"
gdb_test "print null_pmf = &A::foo" "$vhn = \\(int \\(A::\\*\\)\\(A \\*( const)?, int\\)\\) $hex <A::foo ?\\(int\\)>"
gdb_test "print null_pmf = 0" "$vhn = NULL"
# Print with a format, bypassing the direct call to the scalar
# printer. See PR c++/29243.
gdb_test "print/x contain" " = {member = $hex}"

2
gdb/valprint.c
View file

@ -879,7 +879,7 @@ generic_value_print_memberptr
cp_print_class_member (valaddr, type, stream, "&");
}
else
generic_value_print (val, stream, recurse, options, decorations);
value_print_scalar_formatted (val, options, 0, stream);
}
/* See valprint.h. */