From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by sourceware.org (Postfix) with ESMTPS id C91753858CDA for ; Tue, 4 Oct 2022 14:52:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C91753858CDA 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 0A0761F929 for ; Tue, 4 Oct 2022 14:52:08 +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 EA69D139EF for ; Tue, 4 Oct 2022 14:52:07 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 4DYeOJdIPGOEAgAAMHmgww (envelope-from ) for ; Tue, 04 Oct 2022 14:52:07 +0000 Message-ID: Date: Tue, 4 Oct 2022 16:52:07 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.2.2 Subject: [committed][gdb/symtab] Don't complain about inlined functions Content-Language: en-US From: Tom de Vries To: gdb-patches@sourceware.org References: <20220909125738.GA1363@delia.home> In-Reply-To: <20220909125738.GA1363@delia.home> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP 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: Tue, 04 Oct 2022 14:52:10 -0000 On 9/9/22 14:57, Tom de Vries wrote: > Hi, > > With the test-case included in this patch, we get: > ... > (gdb) ptype main^M > During symbol reading: cannot get low and high bounds for subprogram DIE \ > at 0x113^M > During symbol reading: cannot get low and high bounds for subprogram DIE \ > at 0x11f^M > type = int (void)^M > (gdb) FAIL: gdb.dwarf2/inline.exp: ptype main > ... > > The complaints are about foo, with DW_AT_inline == DW_INL_inlined: > ... > <1><11f>: Abbrev Number: 6 (DW_TAG_subprogram) > <120> DW_AT_name : foo > <126> DW_AT_prototyped : 1 > <126> DW_AT_type : <0x10c> > <12a> DW_AT_inline : 1 (inlined) > ... > and foo2, with DW_AT_inline == DW_INL_declared_inlined: > ... > <1><113>: Abbrev Number: 5 (DW_TAG_subprogram) > <114> DW_AT_name : foo2 > <11a> DW_AT_prototyped : 1 > <11a> DW_AT_type : <0x10c> > <11e> DW_AT_inline : 3 (declared as inline and inlined) > ... > > Fix this by not complaining about inlined functions. > > Tested on x86_64-linux. > > Any comments? > Committed. Thanks, - Tom > [gdb/symtab] Don't complain about inlined functions > > --- > gdb/dwarf2/read.c | 9 ++++++++- > gdb/testsuite/gdb.dwarf2/inline.c | 34 ++++++++++++++++++++++++++++++++++ > gdb/testsuite/gdb.dwarf2/inline.exp | 32 ++++++++++++++++++++++++++++++++ > 3 files changed, 74 insertions(+), 1 deletion(-) > > diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c > index 3ca441c4cae..a8a87e36ff0 100644 > --- a/gdb/dwarf2/read.c > +++ b/gdb/dwarf2/read.c > @@ -12024,7 +12024,14 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu) > <= PC_BOUNDS_INVALID) > { > attr = dwarf2_attr (die, DW_AT_external, cu); > - if (attr == nullptr || !attr->as_boolean ()) > + bool external_p = attr != nullptr && attr->as_boolean (); > + attr = dwarf2_attr (die, DW_AT_inline, cu); > + bool inlined_p > + = (attr != nullptr > + && attr->is_nonnegative () > + && (attr->as_nonnegative () == DW_INL_inlined > + || attr->as_nonnegative () == DW_INL_declared_inlined)); > + if (!external_p && !inlined_p) > complaint (_("cannot get low and high bounds " > "for subprogram DIE at %s"), > sect_offset_str (die->sect_off)); > diff --git a/gdb/testsuite/gdb.dwarf2/inline.c b/gdb/testsuite/gdb.dwarf2/inline.c > new file mode 100644 > index 00000000000..2e07f6c4a9d > --- /dev/null > +++ b/gdb/testsuite/gdb.dwarf2/inline.c > @@ -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 . */ > + > +static int __attribute__((always_inline)) > +foo (void) > +{ > + return 0; > +} > + > +static int inline __attribute__((always_inline)) > +foo2 (void) > +{ > + return 0; > +} > + > +int > +main (void) > +{ > + return foo () + foo2 (); > +} > diff --git a/gdb/testsuite/gdb.dwarf2/inline.exp b/gdb/testsuite/gdb.dwarf2/inline.exp > new file mode 100644 > index 00000000000..06182d877af > --- /dev/null > +++ b/gdb/testsuite/gdb.dwarf2/inline.exp > @@ -0,0 +1,32 @@ > +# 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 . > + > +standard_testfile .c > + > +if [prepare_for_testing "failed to prepare" $testfile $srcfile \ > + {debug nowarnings}] { > + return -1 > +} > + > +set cmd "ptype main" > + > +set re \ > + [multi_line \ > + $cmd \ > + "type = int \\(void\\)"] > + > +with_complaints 5 { > + gdb_test $cmd $re "$cmd without complaints" > +}