From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id r7ybBJnr1mKfdhYAWB0awg (envelope-from ) for ; Tue, 19 Jul 2022 13:36:25 -0400 Received: by simark.ca (Postfix, from userid 112) id 0457D1E5EA; Tue, 19 Jul 2022 13:36:25 -0400 (EDT) Authentication-Results: simark.ca; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=sJKkN1Nv; dkim-atps=neutral X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-3.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 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 50AD91E21F for ; Tue, 19 Jul 2022 13:36:24 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BF7413857036 for ; Tue, 19 Jul 2022 17:36:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BF7413857036 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1658252183; bh=eJevgE9Iya9nBBfc/G/CBGITAysH5vIxovP+s5Ra1F8=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=sJKkN1NvrhUxwWBRi2f7+kHZibsuhilgSUhBKabN7jJCiESNMTApC3866MqBqu4Ok YCPn0lnw2Zu/IJNBa3EtgEnxh1XeJItsi9xihVBfV1OcPmPDps9zDZjRrqAj/wMonO mDfV2OOhleDyYgcYtaRpeC9D+aKq0ZLV7g/qt3X4= Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id A94E43858C83 for ; Tue, 19 Jul 2022 17:36:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A94E43858C83 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-out1.suse.de (Postfix) with ESMTPS id DB30C374E8 for ; Tue, 19 Jul 2022 17:36:02 +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 C76C913488 for ; Tue, 19 Jul 2022 17:36:02 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id LHSLL4Lr1mJ+RAAAMHmgww (envelope-from ) for ; Tue, 19 Jul 2022 17:36:02 +0000 Date: Tue, 19 Jul 2022 19:36:01 +0200 To: gdb-patches@sourceware.org Subject: [PATCH][gdb/symtab] Fix .debug_aranges duplicate offset warning Message-ID: <20220719173600.GA6577@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-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: , From: Tom de Vries via Gdb-patches Reply-To: Tom de Vries Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" Hi, The function read_addrmap_from_aranges contains code to issue a warning: ... if (!insertpair.second) { warning (_("Section .debug_aranges in %s has duplicate " "debug_info_offset %s, ignoring .debug_aranges."), objfile_name (objfile), sect_offset_str (per_cu->sect_off)); return false; } ... but the warning is in fact activated when all_comp_units has duplicate entries, which is very misleading. Fix this by: - adding a test-case that should trigger the warning, - replacing the current implementation of the warning with an assert that all_comp_units should not contain duplicates, and - properly re-implementing the warning, such that it is triggered by the test-case. Tested on x86_64-linux. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=29381 Any comments? Thanks, - Tom [gdb/symtab] Fix .debug_aranges duplicate offset warning --- gdb/dwarf2/read.c | 23 ++++-- .../debug-aranges-duplicate-offset-warning.c | 28 ++++++++ .../debug-aranges-duplicate-offset-warning.exp | 81 ++++++++++++++++++++++ 3 files changed, 125 insertions(+), 7 deletions(-) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index cfa15e166bb..0222de4f834 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -2344,15 +2344,13 @@ read_addrmap_from_aranges (dwarf2_per_objfile *per_objfile, const auto insertpair = debug_info_offset_to_per_cu.emplace (per_cu->sect_off, per_cu.get ()); - if (!insertpair.second) - { - warning (_("Section .debug_aranges in %s has duplicate " - "debug_info_offset %s, ignoring .debug_aranges."), - objfile_name (objfile), sect_offset_str (per_cu->sect_off)); - return false; - } + + /* Assume no duplicate offsets in all_comp_units. */ + gdb_assert (insertpair.second); } + std::set debug_info_offset_seen; + section->read (objfile); const bfd_endian dwarf5_byte_order = gdbarch_byte_order (gdbarch); @@ -2410,6 +2408,17 @@ read_addrmap_from_aranges (dwarf2_per_objfile *per_objfile, pulongest (debug_info_offset)); return false; } + if (debug_info_offset_seen.find (sect_offset (debug_info_offset)) + != debug_info_offset_seen.end ()) + { + warning (_("Section .debug_aranges in %s has duplicate " + "debug_info_offset %s, ignoring .debug_aranges."), + objfile_name (objfile), + sect_offset_str (sect_offset (debug_info_offset))); + return false; + } + else + debug_info_offset_seen.insert (sect_offset (debug_info_offset)); dwarf2_per_cu_data *const per_cu = per_cu_it->second; const uint8_t address_size = *addr++; diff --git a/gdb/testsuite/gdb.dwarf2/debug-aranges-duplicate-offset-warning.c b/gdb/testsuite/gdb.dwarf2/debug-aranges-duplicate-offset-warning.c new file mode 100644 index 00000000000..7fdea625913 --- /dev/null +++ b/gdb/testsuite/gdb.dwarf2/debug-aranges-duplicate-offset-warning.c @@ -0,0 +1,28 @@ +/* + 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 . */ + +void +frame2 (void) +{ + asm ("frame2_label: .globl frame2_label"); +} + +int +main (void) +{ + asm ("main_label: .globl main_label"); + frame2 (); +} diff --git a/gdb/testsuite/gdb.dwarf2/debug-aranges-duplicate-offset-warning.exp b/gdb/testsuite/gdb.dwarf2/debug-aranges-duplicate-offset-warning.exp new file mode 100644 index 00000000000..0e0e0cb893b --- /dev/null +++ b/gdb/testsuite/gdb.dwarf2/debug-aranges-duplicate-offset-warning.exp @@ -0,0 +1,81 @@ +# 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 . +load_lib dwarf.exp + +# Test with two aranges entries referring to the same CU. + +# This test can only be run on targets which support DWARF-2 and use gas. +if {![dwarf2_support]} { + verbose "Skipping $gdb_test_file_name." + return 0 +} + +standard_testfile .c -dw.S + +set asm_file [standard_output_file $srcfile2] +Dwarf::assemble $asm_file { + global srcdir subdir srcfile srcfile2 + declare_labels ranges_label + + get_func_info main + get_func_info frame2 + + cu { label cu_label } { + compile_unit { + {language @DW_LANG_C} + {name $srcfile} + } { + subprogram { + {external 1 flag} + {name main} + {low_pc $main_start addr} + {high_pc $main_len DW_FORM_data4} + } + subprogram { + {external 1 flag} + {name frame2} + {low_pc $frame2_start addr} + {high_pc $frame2_len DW_FORM_data4} + } + } + } + + aranges {} cu_label { + arange {} $main_start $main_len + } + aranges {} cu_label { + arange {} $frame2_start $frame2_len + } +} + +if { [prepare_for_testing "failed to prepare" ${testfile} \ + [list $srcfile $asm_file] {nodebug}] } { + return -1 +} + +set readnow_p [readnow] + +set test "file command warnings" +if { $readnow_p } { + set re "warning:" + gdb_assert { ![regexp $re $gdb_file_cmd_msg] } $test +} else { + set re \ + [concat \ + "warning: Section .debug_aranges in \[^\r\n\]* has" \ + "duplicate debug_info_offset $hex," \ + "ignoring \\.debug_aranges\\."] + gdb_assert { [regexp $re $gdb_file_cmd_msg] } $test +}