From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id 7D7EC386F0CD for ; Thu, 30 Jun 2022 14:59:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7D7EC386F0CD Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 560BA1FDF9 for ; Thu, 30 Jun 2022 14:59:38 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 4286713A5C for ; Thu, 30 Jun 2022 14:59:38 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id EakgD1q6vWL4dwAAMHmgww (envelope-from ) for ; Thu, 30 Jun 2022 14:59:38 +0000 Date: Thu, 30 Jun 2022 16:59:31 +0200 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH][gdb/exp] Fix internal error when printing C++ pointer-to-member Message-ID: <20220630145930.GA20127@delia.home> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Jun 2022 14:59:41 -0000 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 . */ + +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 . + +# 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"