From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id E73PFWBVMmYxBQIAWB0awg (envelope-from ) for ; Wed, 01 May 2024 10:44:48 -0400 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=BdGMLd/4; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=1Jnn5z5Z; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=XI2dOCPE; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=OqcKSgWA; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 3DE141E0C1; Wed, 1 May 2024 10:44:48 -0400 (EDT) Received: from server2.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 ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id BF31C1E092 for ; Wed, 1 May 2024 10:44:45 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2D482385841E for ; Wed, 1 May 2024 14:44:45 +0000 (GMT) Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id 1B2BD3858D20 for ; Wed, 1 May 2024 14:44:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1B2BD3858D20 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 1B2BD3858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714574666; cv=none; b=n5MR+uoqRchPhqfCgwr2oxC+32hFDUXXCgETvfIGrUjrNNj4QqDuZq3TGd4eYLe9PTog0SP7kWkMDSW/2lnvMMe0tDMyw0aQ/gJz/YeInhfE2zMWfj0xVC+SSukHa7j3G1zaatW+vh7rIxVQ8agFCXfvDDE2zqYCd8hgfqVgcp8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714574666; c=relaxed/simple; bh=PdKLLxWUtZWXiY3ZBTFJt4XdG2LB+UgyGexPfAJYpT8=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=GiJfEM5I8dFRg/eIqK63KAgQyDrLxctqCoeueWdErq5eKBaO/uaHUaIhvv4iaUINP4MVD5OCui8d1P+E7awT6soe+ohLlDxXhJtShNyU6j7XCcU1XJYdv4wstxqPp5i4Y/mUrrGaYywoWcG7cn2cvSQLkmI6cxArCYHg4aQUmuo= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id DF2A21F86C for ; Wed, 1 May 2024 14:44:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1714574663; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=WGEbotG/1TOmb9So+baQCkq+paueP6BYTyYJnQFte/s=; b=BdGMLd/4diX9qGbTyUWQqMrXNU4iHoWkXtiS63VgEvTd6322/zo2yEFrjn53sKNvk3mNR2 QeTYZTPX+/DZmn0DY1gVQEIDrVVDNDNDYROKxowjceH2K0GQpHjeMXhhyLZ+LShhQjci4g lPGphYh1gl6WeeO7WXjA5zdv8qIRdd4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1714574663; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=WGEbotG/1TOmb9So+baQCkq+paueP6BYTyYJnQFte/s=; b=1Jnn5z5Zn1NO5hQQxTSERwRtCuOSTNQzZ4kRWkTfIkiISBxuReqXs1B5n/l1WG7MDh2a+W wRmO3KBLb0mxSBAg== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=XI2dOCPE; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=OqcKSgWA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1714574661; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=WGEbotG/1TOmb9So+baQCkq+paueP6BYTyYJnQFte/s=; b=XI2dOCPEQ4XgKyjLKLY0dr+hnll9VA3HNz04XCcsz8jIfBLSFqGCgv+N88d4JYiLbCJJ9x 5f01KeS/uJxbebgPdZd5z/atipvi3Wn/YsebAZgqPKu2TH1BJidJjbrG64DYF6JFGK+AER Eb4gfZ66i8tdJCZ9yk4jm/9LUKAkzoo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1714574661; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=WGEbotG/1TOmb9So+baQCkq+paueP6BYTyYJnQFte/s=; b=OqcKSgWAcXiArbvgGwXBbSDkxiJbtNDm3P7gnMZlip7J/AI/UcaWuecEVebJ2XzOPtgTPr Pi8UKfNMmC12oqCw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id CA9BA137BA for ; Wed, 1 May 2024 14:44:21 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id w7QMMEVVMmamTQAAD6G6ig (envelope-from ) for ; Wed, 01 May 2024 14:44:21 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH] [gdb/symtab] Work around PR gas/29517, dwarf2 case Date: Wed, 1 May 2024 16:44:41 +0200 Message-Id: <20240501144441.4921-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -5.01 X-Rspamd-Action: no action X-Rspamd-Queue-Id: DF2A21F86C X-Spam-Level: X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-5.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; DWL_DNSWL_MED(-2.00)[suse.de:dkim]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; RCPT_COUNT_ONE(0.00)[1]; FUZZY_BLOCKED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; MIME_TRACE(0.00)[0:+]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; ARC_NA(0.00)[]; TO_DN_NONE(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_COUNT_TWO(0.00)[2]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; FROM_EQ_ENVFROM(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[sourceware.org:url, gnu.org:url, suse.de:dkim, imap1.dmz-prg2.suse.org:helo, imap1.dmz-prg2.suse.org:rdns] X-Spam-Status: No, score=-12.3 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 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.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org In commit 1d45d90934b ("[gdb/symtab] Work around PR gas/29517") we added a workaround for PR gas/29517. The problem is present in gas version 2.39, and fixed in 2.40, so the workaround is only active for gas version == 2.39. However, the problem in gas is only fixed for dwarf version >= 3, which supports DW_TAG_unspecified_type. Fix this by also activating the workaround for dwarf version == 2. Tested on x86_64-linux. PR symtab/31689 https://sourceware.org/bugzilla/show_bug.cgi?id=31689 --- gdb/dwarf2/read.c | 5 +++- .../gdb.dwarf2/dw2-unspecified-type-foo.c | 7 ++++++ .../gdb.dwarf2/dw2-unspecified-type.c | 3 ++- .../gdb.dwarf2/dw2-unspecified-type.exp | 23 ++++++++++++++++++- 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 7eacafc25b5..00e8608f9ce 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -14549,10 +14549,13 @@ read_subroutine_type (struct die_info *die, struct dwarf2_cu *cu) type = die_type (die, cu); + /* PR gas/29517 occurs in 2.39, and is fixed in 2.40, but it's only fixed + for dwarf version >= 3 which supports DW_TAG_unspecified_type. */ if (type->code () == TYPE_CODE_VOID && !type->is_stub () && die->child == nullptr - && producer_is_gas_2_39 (cu)) + && (cu->per_cu->version () == 2 + || producer_is_gas_2_39 (cu))) { /* Work around PR gas/29517, pretend we have an DW_TAG_unspecified_type return type. */ diff --git a/gdb/testsuite/gdb.dwarf2/dw2-unspecified-type-foo.c b/gdb/testsuite/gdb.dwarf2/dw2-unspecified-type-foo.c index 46c543b7b59..76b8b15a7b9 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-unspecified-type-foo.c +++ b/gdb/testsuite/gdb.dwarf2/dw2-unspecified-type-foo.c @@ -21,3 +21,10 @@ foo (void) asm ("foo_label: .globl foo_label"); return 0; } + +int +foo2 (void) +{ + asm ("foo2_label: .globl foo2_label"); + return 0; +} diff --git a/gdb/testsuite/gdb.dwarf2/dw2-unspecified-type.c b/gdb/testsuite/gdb.dwarf2/dw2-unspecified-type.c index 666c7b70bba..7f3add04c1b 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-unspecified-type.c +++ b/gdb/testsuite/gdb.dwarf2/dw2-unspecified-type.c @@ -16,6 +16,7 @@ along with this program. If not, see . */ extern int foo (void); +extern int foo2 (void); int bar (void) @@ -27,6 +28,6 @@ bar (void) int main (void) { - int res = foo () + bar (); + int res = foo () + bar () + foo2 (); return res; } diff --git a/gdb/testsuite/gdb.dwarf2/dw2-unspecified-type.exp b/gdb/testsuite/gdb.dwarf2/dw2-unspecified-type.exp index 84c27fc2e1d..82b5bf8f003 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-unspecified-type.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-unspecified-type.exp @@ -34,11 +34,19 @@ lassign $bar_res \ bar_start bar_len set bar_end "$bar_start + $bar_len" +set foo2_res \ + [function_range foo2 \ + [list ${srcdir}/${subdir}/$srcfile ${srcdir}/${subdir}/$srcfile2]] +lassign $foo2_res \ + foo2_start foo2_len +set foo2_end "$foo2_start + $foo2_len" + # Create the DWARF. set asm_file [standard_output_file $srcfile3] Dwarf::assemble $asm_file { global foo_start foo_end global bar_start bar_end + global foo2_start foo2_end declare_labels unspecified_type_label cu {} { @@ -68,6 +76,19 @@ Dwarf::assemble $asm_file { } } } + + cu { version 2 } { + compile_unit { + {language @DW_LANG_Mips_Assembler} + {producer "GNU AS 2.40.0"} + } { + DW_TAG_subprogram { + {name foo2} + {low_pc $foo2_start addr} + {high_pc $foo2_end addr} + } + } + } } if [prepare_for_testing "failed to prepare" $testfile \ @@ -79,7 +100,7 @@ if ![runto_main] { return -1 } -foreach f {foo bar} { +foreach f {foo bar foo2} { # Print the function type. Return type should be stub type, which is printed # as void. gdb_test "ptype $f" "type = void \\(void\\)" base-commit: 347775edd49c0d8f6fda3d13a39c8cac6196da30 -- 2.35.3