public inbox for gdb-cvs@sourceware.org help / color / mirror / Atom feed
From: Tom Tromey <tromey@sourceware.org> To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Fix regression in pointer-to-member printing Date: Mon, 31 Oct 2022 14:55:28 +0000 (GMT) [thread overview] Message-ID: <20221031145528.EB3CA385E007@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=86430497337968e6163aef370c6312e7b5ed6504 commit 86430497337968e6163aef370c6312e7b5ed6504 Author: Tom Tromey <tromey@adacore.com> Date: Tue Oct 18 11:32:52 2022 -0600 Fix regression in pointer-to-member printing 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. Diff: --- gdb/testsuite/gdb.cp/member-ptr.cc | 8 ++++++++ gdb/testsuite/gdb.cp/member-ptr.exp | 4 ++++ gdb/valprint.c | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/gdb.cp/member-ptr.cc b/gdb/testsuite/gdb.cp/member-ptr.cc index 22ffcc58d39..a563d2e6af3 100644 --- a/gdb/testsuite/gdb.cp/member-ptr.cc +++ b/gdb/testsuite/gdb.cp/member-ptr.cc @@ -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); diff --git a/gdb/testsuite/gdb.cp/member-ptr.exp b/gdb/testsuite/gdb.cp/member-ptr.exp index 110497b893b..5b91bcb493a 100644 --- a/gdb/testsuite/gdb.cp/member-ptr.exp +++ b/gdb/testsuite/gdb.cp/member-ptr.exp @@ -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}" diff --git a/gdb/valprint.c b/gdb/valprint.c index 25db57ea794..48d611ecf8a 100644 --- a/gdb/valprint.c +++ b/gdb/valprint.c @@ -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. */
reply other threads:[~2022-10-31 14:55 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20221031145528.EB3CA385E007@sourceware.org \ --to=tromey@sourceware.org \ --cc=gdb-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).