From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2205) id 722233857340; Tue, 5 Jul 2022 20:41:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 722233857340 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom de Vries To: gdb-cvs@sourceware.org Subject: [binutils-gdb] [gdb/exp] Fix internal error when printing C++ pointer-to-member X-Act-Checkin: binutils-gdb X-Git-Author: Tom de Vries X-Git-Refname: refs/heads/master X-Git-Oldrev: 99298c958c5393402cd2bc2885c195838a9dd363 X-Git-Newrev: 22f8e2e726629e7f09a49c66a6a2f746a49ba479 Message-Id: <20220705204129.722233857340@sourceware.org> Date: Tue, 5 Jul 2022 20:41:29 +0000 (GMT) X-BeenThere: gdb-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jul 2022 20:41:29 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D22f8e2e72662= 9e7f09a49c66a6a2f746a49ba479 commit 22f8e2e726629e7f09a49c66a6a2f746a49ba479 Author: Tom de Vries Date: Tue Jul 5 22:41:25 2022 +0200 [gdb/exp] Fix internal error when printing C++ pointer-to-member =20 When running the test-case included with this patch, we run into: ... (gdb) print ptm^M $1 =3D gdb/gdbtypes.h:695: internal-error: loc_bitpos: \ Assertion `m_loc_kind =3D=3D FIELD_LOC_KIND_BITPOS' failed.^M ... while printing a c++ pointer-to-member. =20 Fix this by skipping static fields in cp_find_class_member, such that w= e have: ... (gdb) print ptm^M $1 =3D &A::i^M ... =20 Tested on x86_64-linux. =20 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=3D29294 Diff: --- 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..1d7dafcb149 100644 --- a/gdb/cp-valprint.c +++ b/gdb/cp-valprint.c @@ -636,7 +636,10 @@ cp_find_class_member (struct type **self_p, int *field= no, =20 for (i =3D TYPE_N_BASECLASSES (self); i < len; i++) { - LONGEST bitpos =3D self->field (i).loc_bitpos (); + field &f =3D self->field (i); + if (field_is_static (&f)) + continue; + LONGEST bitpos =3D f.loc_bitpos (); =20 QUIT; if (offset =3D=3D 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 . = */ + +struct A +{ + int i; +}; + +struct B : public A +{ + static const int j =3D 0; +}; + +int B::*ptm =3D &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 . + +# 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" " =3D &A::i"