From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id qL6kK0QTmF/rQgAAWB0awg (envelope-from ) for ; Tue, 27 Oct 2020 08:32:04 -0400 Received: by simark.ca (Postfix, from userid 112) id 96D1E1EFBB; Tue, 27 Oct 2020 08:32:04 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=MAILING_LIST_MULTI, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id E1E7D1E58E for ; Tue, 27 Oct 2020 08:32:03 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A80FB3858D37; Tue, 27 Oct 2020 12:32:03 +0000 (GMT) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by sourceware.org (Postfix) with ESMTPS id 6BA1E3858D37 for ; Tue, 27 Oct 2020 12:32:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 6BA1E3858D37 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tdevries@suse.de X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 81114AC6A for ; Tue, 27 Oct 2020 12:31:59 +0000 (UTC) Subject: Re: [committed][gdb/testsuite] Fix section matching in find_pc_sect_compunit_symtab From: Tom de Vries To: gdb-patches@sourceware.org References: <20201027123103.GA24715@delia> Autocrypt: addr=tdevries@suse.de; keydata= xsBNBF0ltCcBCADDhsUnMMdEXiHFfqJdXeRvgqSEUxLCy/pHek88ALuFnPTICTwkf4g7uSR7 HvOFUoUyu8oP5mNb4VZHy3Xy8KRZGaQuaOHNhZAT1xaVo6kxjswUi3vYgGJhFMiLuIHdApoc u5f7UbV+egYVxmkvVLSqsVD4pUgHeSoAcIlm3blZ1sDKviJCwaHxDQkVmSsGXImaAU+ViJ5l CwkvyiiIifWD2SoOuFexZyZ7RUddLosgsO0npVUYbl6dEMq2a5ijGF6/rBs1m3nAoIgpXk6P TCKlSWVW6OCneTaKM5C387972qREtiArTakRQIpvDJuiR2soGfdeJ6igGA1FZjU+IsM5ABEB AAHNH1RvbSBkZSBWcmllcyA8dGRldnJpZXNAc3VzZS5kZT7CwKsEEwEIAD4WIQSsnSe5hKbL MK1mGmjuhV2rbOJEoAUCXSW0JwIbAwUJA8JnAAULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAh CRDuhV2rbOJEoBYhBKydJ7mEpsswrWYaaO6FXats4kSgc48H/Ra2lq5p3dHsrlQLqM7N68Fo eRDf3PMevXyMlrCYDGLVncQwMw3O/AkousktXKQ42DPJh65zoXB22yUt8m0g12xkLax98KFJ 5NyUloa6HflLl+wQL/uZjIdNUQaHQLw3HKwRMVi4l0/Jh/TygYG1Dtm8I4o708JS4y8GQxoQ UL0z1OM9hyM3gI2WVTTyprsBHy2EjMOu/2Xpod95pF8f90zBLajy6qXEnxlcsqreMaqmkzKn 3KTZpWRxNAS/IH3FbGQ+3RpWkNGSJpwfEMVCeyK5a1n7yt1podd1ajY5mA1jcaUmGppqx827 8TqyteNe1B/pbiUt2L/WhnTgW1NC1QDOwE0EXSW0JwEIAM99H34Bu4MKM7HDJVt864MXbx7B 1M93wVlpJ7Uq+XDFD0A0hIal028j+h6jA6bhzWto4RUfDl/9mn1StngNVFovvwtfzbamp6+W pKHZm9X5YvlIwCx131kTxCNDcF+/adRW4n8CU3pZWYmNVqhMUiPLxElA6QhXTtVBh1RkjCZQ Kmbd1szvcOfaD8s+tJABJzNZsmO2hVuFwkDrRN8Jgrh92a+yHQPd9+RybW2l7sJv26nkUH5Z 5s84P6894ebgimcprJdAkjJTgprl1nhgvptU5M9Uv85Pferoh2groQEAtRPlCGrZ2/2qVNe9 XJfSYbiyedvApWcJs5DOByTaKkcAEQEAAcLAkwQYAQgAJhYhBKydJ7mEpsswrWYaaO6FXats 4kSgBQJdJbQnAhsMBQkDwmcAACEJEO6FXats4kSgFiEErJ0nuYSmyzCtZhpo7oVdq2ziRKD3 twf7BAQBZ8TqR812zKAD7biOnWIJ0McV72PFBxmLIHp24UVe0ZogtYMxSWKLg3csh0yLVwc7 H3vldzJ9AoK3Qxp0Q6K/rDOeUy3HMqewQGcqrsRRh0NXDIQk5CgSrZslPe47qIbe3O7ik/MC q31FNIAQJPmKXX25B115MMzkSKlv4udfx7KdyxHrTSkwWZArLQiEZj5KG4cCKhIoMygPTA3U yGaIvI/BGOtHZ7bEBVUCFDFfOWJ26IOCoPnSVUvKPEOH9dv+sNy7jyBsP5QxeTqwxC/1ZtNS DUCSFQjqA6bEGwM22dP8OUY6SC94x1G81A9/xbtm9LQxKm0EiDH8KBMLfQ== Message-ID: <29d027ab-1830-3f7c-84f0-a369341336b6@suse.de> Date: Tue, 27 Oct 2020 13:31:59 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: <20201027123103.GA24715@delia> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit 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: , Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" [ Sorry, this should have been: gdb/symtab. ] On 10/27/20 1:31 PM, Tom de Vries wrote: > Hi, > > When running test-case gdb.base/list-ambiguous.exp with target board readnow, > we run into: > ... > FAIL: gdb.base/list-ambiguous.exp: list ambiguous_fun > ... > > The test-case contains two static functions ambiguous_fun, one in > list-ambiguous0.c and one in list-ambiguous1.c. > > The list command is supposed to show both, but only the one from > list-ambiguous0.c is shown. > > This is due to the section check in find_pc_sect_compunit_symtab. It checks > whether the candidate compunit_symtab contains a symbol that has the required > section. This check is only done for GLOBAL_BLOCK symbols. > > The check succeeds for the compunit_symtab for list-ambiguous0.c, because it > contains main, but it fails for list-ambiguous0.c because it has no global > symbols. > > Fix this by extending the section check to STATIC_BLOCK symbols. > > Tested on x86_64-linux. > > Committed to trunk. > > Thanks, > - Tom > > [gdb/testsuite] Fix section matching in find_pc_sect_compunit_symtab > > gdb/ChangeLog: > > 2020-10-27 Tom de Vries > > * symtab.c (find_pc_sect_compunit_symtab): Include STATIC_BLOCK > symbols in section check. > > gdb/testsuite/ChangeLog: > > 2020-10-27 Tom de Vries > > * gdb.base/list-ambiguous-readnow.exp: New file. > > --- > gdb/symtab.c | 18 ++++++++++++------ > gdb/testsuite/gdb.base/list-ambiguous-readnow.exp | 22 ++++++++++++++++++++++ > 2 files changed, 34 insertions(+), 6 deletions(-) > > diff --git a/gdb/symtab.c b/gdb/symtab.c > index eda33a7eb4..f6e2475800 100644 > --- a/gdb/symtab.c > +++ b/gdb/symtab.c > @@ -2954,13 +2954,19 @@ find_pc_sect_compunit_symtab (CORE_ADDR pc, struct obj_section *section) > struct symbol *sym = NULL; > struct block_iterator iter; > > - ALL_BLOCK_SYMBOLS (global_block, iter, sym) > + for (int b_index = GLOBAL_BLOCK; > + b_index <= STATIC_BLOCK && sym == NULL; > + ++b_index) > { > - fixup_symbol_section (sym, obj_file); > - if (matching_obj_sections (SYMBOL_OBJ_SECTION (obj_file, > - sym), > - section)) > - break; > + const struct block *b = BLOCKVECTOR_BLOCK (bv, b_index); > + ALL_BLOCK_SYMBOLS (b, iter, sym) > + { > + fixup_symbol_section (sym, obj_file); > + if (matching_obj_sections (SYMBOL_OBJ_SECTION (obj_file, > + sym), > + section)) > + break; > + } > } > if (sym == NULL) > continue; /* No symbol in this symtab matches > diff --git a/gdb/testsuite/gdb.base/list-ambiguous-readnow.exp b/gdb/testsuite/gdb.base/list-ambiguous-readnow.exp > new file mode 100644 > index 0000000000..347a71ba52 > --- /dev/null > +++ b/gdb/testsuite/gdb.base/list-ambiguous-readnow.exp > @@ -0,0 +1,22 @@ > +# Copyright 2020 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 . > + > +# Run list-ambiguous.exp with -readnow. > + > +save_vars { GDBFLAGS } { > + append GDBFLAGS " -readnow" > + > + source $srcdir/$subdir/list-ambiguous.exp > +} >