From patchwork Tue May 21 15:44:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 90612 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 78110384AB4A for ; Tue, 21 May 2024 15:44:22 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2a07:de40:b251:101:10:150:64:1]) by sourceware.org (Postfix) with ESMTPS id 852853858416 for ; Tue, 21 May 2024 15:43:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 852853858416 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 852853858416 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1716306188; cv=none; b=RQ1/KU88KGUEAZ4Mg3UkRSAkrox9hSgZzW7YVetJJOck3OgT4yPxjaIKXzjj8rlbVfIwAL8JJYrkyqq2veAfiREIYCJt1N8ZH3xA2nxGk4xHeag0vtOuyRpBGfzlsuR325gEoPrSLBSjQ9MbTQdhLMeIJhdECp/qasqvTvymxn8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1716306188; c=relaxed/simple; bh=CmRxv3qIsn+xpog5AWC6jDerS5+SgQ/GWaSpm1itL2s=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=XTbRGc/abdQm2fDJfcsI6qd1QLFoQromnqqci2BFsfxTdv/RHRHfsZcYaD1cyhkx2LkXYHfMb5SV+nrwsuBry/UgLpzSV7W99y64cjfC292a+XgVMOhbW7s1xKEC1G4E/dcAfqjU2nBF2cxOw3ZkCYp8f2OTeFWmKb3rwvCy9Cs= 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-out1.suse.de (Postfix) with ESMTPS id 95B3221A9A for ; Tue, 21 May 2024 15:43:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1716306183; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wBUrAOANgVsJF0S/o0u9t4Q98hFZyLdF2pa3NyLLgRA=; b=m/dZ0Xs9+sPQsC7JKE4C44Z3jnOwlTlBuLUKkuqNZhjFl8JZ5lkLPLK09ccmy4+RSil0tL Hs/YivIyY5qrHgWdltoEdas9/gP2zVWiLIFtzgdbTjx3LZN4qVOjCHRzvVk/+TSVFmtHSr XPY2FNoy9qWtksYpJ2qeoZnXGTkjPQ0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1716306183; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wBUrAOANgVsJF0S/o0u9t4Q98hFZyLdF2pa3NyLLgRA=; b=40UiIt4ThF6SDpABmydDemC0d/E+PD48EM8nVIyAa8X60nBXahrDlbktPW9daOoaqa4kZB wjsNxsdeUmrDLdBA== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b="m/dZ0Xs9"; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=40UiIt4T DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1716306183; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wBUrAOANgVsJF0S/o0u9t4Q98hFZyLdF2pa3NyLLgRA=; b=m/dZ0Xs9+sPQsC7JKE4C44Z3jnOwlTlBuLUKkuqNZhjFl8JZ5lkLPLK09ccmy4+RSil0tL Hs/YivIyY5qrHgWdltoEdas9/gP2zVWiLIFtzgdbTjx3LZN4qVOjCHRzvVk/+TSVFmtHSr XPY2FNoy9qWtksYpJ2qeoZnXGTkjPQ0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1716306183; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wBUrAOANgVsJF0S/o0u9t4Q98hFZyLdF2pa3NyLLgRA=; b=40UiIt4ThF6SDpABmydDemC0d/E+PD48EM8nVIyAa8X60nBXahrDlbktPW9daOoaqa4kZB wjsNxsdeUmrDLdBA== 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 81B2613685 for ; Tue, 21 May 2024 15:43:03 +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 uPNJHgfBTGbJGwAAD6G6ig (envelope-from ) for ; Tue, 21 May 2024 15:43:03 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 06/11] [gdb/macros] Handle v4 dwarf in gdb.base/fission-macro.exp Date: Tue, 21 May 2024 17:44:10 +0200 Message-Id: <20240521154415.9543-6-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240521154415.9543-1-tdevries@suse.de> References: <20240521154415.9543-1-tdevries@suse.de> MIME-Version: 1.0 X-Spam-Score: -3.01 X-Rspamd-Action: no action X-Rspamd-Queue-Id: 95B3221A9A X-Spam-Level: X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; 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)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_TLS_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; TO_DN_NONE(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; DKIM_TRACE(0.00)[suse.de:+] 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, 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+patchwork=sourceware.org@sourceware.org When running test-case gdb.base/fission-macro.exp with dwarf v4 enabled and a gcc trunk build containing the fix for gcc PR debug/115066, we run into: ... (gdb) info macro FIRST^M Defined at /data/vries/gdb/src/gdb/testsuite/gdb.base/fission-macro.c:0^M -DFIRST=1^M (gdb) FAIL: gdb.base/fission-macro.exp: dwarf_version=4: dwarf_bits=32: \ strict_dwarf=0: info macro FIRST ... The problem is in dwarf_decode_macros, where we're setting str_offsets_base effectively to 8: ... if (cu->per_cu->version () <= 4) str_offsets_base = cu->header.addr_size; ... Fix this by setting it to 0. Tested on x86_64-linux. Tested test-case (and gdb.base/fission-macro-i.exp) using a current gcc trunk build and gcc 7-14. --- gdb/dwarf2/read.c | 2 +- gdb/testsuite/gdb.base/fission-macro-i.exp | 6 +++++- gdb/testsuite/gdb.base/fission-macro.exp | 6 +++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index abe128f35df..e5f65ad28f2 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -21259,7 +21259,7 @@ dwarf_decode_macros (struct dwarf2_cu *cu, unsigned int offset, ->sections.str_offsets; str_section = &cu->dwo_unit->dwo_file->sections.str; if (cu->per_cu->version () <= 4) - str_offsets_base = cu->header.addr_size; + str_offsets_base = 0; else { bfd *abfd = str_offsets_section->get_bfd_owner (); diff --git a/gdb/testsuite/gdb.base/fission-macro-i.exp b/gdb/testsuite/gdb.base/fission-macro-i.exp index ae211d0e09b..62304f9b69e 100644 --- a/gdb/testsuite/gdb.base/fission-macro-i.exp +++ b/gdb/testsuite/gdb.base/fission-macro-i.exp @@ -65,7 +65,11 @@ proc do_tests { dwarf_version dwarf_bits strict_dwarf } { gdb_test "info macro FOURTH" "#define FOURTH 4" } -foreach_with_prefix dwarf_version {5} { +foreach_with_prefix dwarf_version {4 5} { + if { $dwarf_version == 4 && [gcc_major_version] < 15 } { + # Gcc does not contain fix for PR debug/115066. + continue + } foreach_with_prefix dwarf_bits {32 64} { foreach_with_prefix strict_dwarf {0 1} { do_tests $dwarf_version $dwarf_bits $strict_dwarf diff --git a/gdb/testsuite/gdb.base/fission-macro.exp b/gdb/testsuite/gdb.base/fission-macro.exp index 4eb9c0efe21..9e5d5c0a0d5 100644 --- a/gdb/testsuite/gdb.base/fission-macro.exp +++ b/gdb/testsuite/gdb.base/fission-macro.exp @@ -66,7 +66,11 @@ proc do_tests { dwarf_version dwarf_bits strict_dwarf } { gdb_test "info macro FOURTH" "#define FOURTH 4" } -foreach_with_prefix dwarf_version {5} { +foreach_with_prefix dwarf_version {4 5} { + if { $dwarf_version == 4 && [gcc_major_version] < 15 } { + # Gcc does not contain fix for PR debug/115066. + continue + } foreach_with_prefix dwarf_bits {32 64} { foreach_with_prefix strict_dwarf {0 1} { do_tests $dwarf_version $dwarf_bits $strict_dwarf