From: Tom de Vries <tdevries@suse.de>
To: gdb-patches@sourceware.org
Subject: [PATCH][gdb/exp] Fix internal error when printing C++ pointer-to-member
Date: Thu, 30 Jun 2022 16:59:31 +0200 [thread overview]
Message-ID: <20220630145930.GA20127@delia.home> (raw)
Hi,
When running the test-case included with this patch, we run into:
...
(gdb) print ptm^M
$1 = gdb/gdbtypes.h:695: internal-error: loc_bitpos: \
Assertion `m_loc_kind == FIELD_LOC_KIND_BITPOS' failed.^M
...
while printing a c++ pointer-to-member.
Fix this by skipping fields with m_loc_kind != FIELD_LOC_KIND_BITPOS in
cp_find_class_member, such that we have:
...
(gdb) print ptm^M
$1 = &A::i^M
...
Tested on x86_64-linux.
https://sourceware.org/bugzilla/show_bug.cgi?id=29294
Any comments?
Thanks,
- Tom
[gdb/exp] Fix internal error when printing C++ pointer-to-member
---
gdb/cp-valprint.c | 5 ++++-
gdb/testsuite/gdb.cp/pointer-to-member.cc | 34 ++++++++++++++++++++++++++++++
gdb/testsuite/gdb.cp/pointer-to-member.exp | 28 ++++++++++++++++++++++++
3 files changed, 66 insertions(+), 1 deletion(-)
diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
index 43a52698b71..11d75ced602 100644
--- a/gdb/cp-valprint.c
+++ b/gdb/cp-valprint.c
@@ -636,7 +636,10 @@ cp_find_class_member (struct type **self_p, int *fieldno,
for (i = TYPE_N_BASECLASSES (self); i < len; i++)
{
- LONGEST bitpos = self->field (i).loc_bitpos ();
+ field &f = self->field (i);
+ if (f.loc_kind () != FIELD_LOC_KIND_BITPOS)
+ continue;
+ LONGEST bitpos = f.loc_bitpos ();
QUIT;
if (offset == bitpos)
diff --git a/gdb/testsuite/gdb.cp/pointer-to-member.cc b/gdb/testsuite/gdb.cp/pointer-to-member.cc
new file mode 100644
index 00000000000..0570c9cc8ae
--- /dev/null
+++ b/gdb/testsuite/gdb.cp/pointer-to-member.cc
@@ -0,0 +1,34 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+ Copyright 2022 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+struct A
+{
+ int i;
+};
+
+struct B : public A
+{
+ static const int j = 0;
+};
+
+int B::*ptm = &B::i;
+
+int
+main ()
+{
+ return 0;
+}
diff --git a/gdb/testsuite/gdb.cp/pointer-to-member.exp b/gdb/testsuite/gdb.cp/pointer-to-member.exp
new file mode 100644
index 00000000000..d946a60af7b
--- /dev/null
+++ b/gdb/testsuite/gdb.cp/pointer-to-member.exp
@@ -0,0 +1,28 @@
+# Copyright (C) 2022 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# This file is part of the gdb testsuite.
+
+# Test printing c++ pointer-to-member.
+
+if { [skip_cplus_tests] } { continue }
+
+standard_testfile .cc
+
+if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
+ return -1
+}
+
+gdb_test "print ptm" " = &A::i"
next reply other threads:[~2022-06-30 14:59 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-30 14:59 Tom de Vries [this message]
2022-07-05 18:47 ` Tom Tromey
2022-07-05 20:42 ` Tom de Vries
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=20220630145930.GA20127@delia.home \
--to=tdevries@suse.de \
--cc=gdb-patches@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: link
Be 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).