From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id GMnkOQ4TmF/rQgAAWB0awg (envelope-from ) for ; Tue, 27 Oct 2020 08:31:10 -0400 Received: by simark.ca (Postfix, from userid 112) id E82501EFBB; Tue, 27 Oct 2020 08:31:10 -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 490821E58E for ; Tue, 27 Oct 2020 08:31:10 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D1A4A3858D37; Tue, 27 Oct 2020 12:31:09 +0000 (GMT) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by sourceware.org (Postfix) with ESMTPS id 315C43858D37 for ; Tue, 27 Oct 2020 12:31:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 315C43858D37 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 46E13B233 for ; Tue, 27 Oct 2020 12:31:06 +0000 (UTC) Date: Tue, 27 Oct 2020 13:31:04 +0100 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [committed][gdb/testsuite] Fix section matching in find_pc_sect_compunit_symtab Message-ID: <20201027123103.GA24715@delia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) 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" 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 +}