From patchwork Tue May 21 15:44:11 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: 90614 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 6C465384AB4B for ; Tue, 21 May 2024 15:44:37 +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 A04883858410 for ; Tue, 21 May 2024 15:43:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A04883858410 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 A04883858410 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=eO3Ien80hzDa5C1gYVyazoMH4a2SkwxCQXfrR5BNdfFiEcAxDTPCB0t01WyvQW/BkrsN3RRHnNu5lnmxXetBBL+VQvprkNF/L5hyLSByeTprof60Rbeyjf1bmEqowA0DzH5zgieU0WZ/CctvuY/T0tIloDidFHUxSaKHwB0e93k= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1716306188; c=relaxed/simple; bh=cNYG8ITEDWHp3xndVHfXo7dLw4u0Q34XEEAdZZCL6MA=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=J3GBMlvHPGdNiHY7gOS/WJB1dwfgC2s72eZmqfFg6Xtl0/Ir/VNWydLsxJtCka8z7fKBaq37PAtHWvaExPjbj6x90aV2TVb4+lF8WFn8a/77MjTVo9az2kNFFRb96Tm36AOmC5S+MBTMGbvljSjP66YM8kIJafaJPqqJhInTFBg= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (unknown [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 B204121B46 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=kpsR+medd31H4BwjTrBpt+tcMAvxfHpSqWu+O79gi6E=; b=E55b9vOcAwiUBH3xQm0KP8aFwxkZL9/xlYfZEgqD54g4sSY/Gke7lQ3YHVD/p++BXghLwd nUYxtSJnRK6bjbXrz5tS5wuWK/xgjc31B7Fcz7V/d9mqrmhHkQFJRFl8AfR9a9Ii6f/Enx 99pTTcrYXPG0HSPdGU9LfOoYAaWGdII= 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=kpsR+medd31H4BwjTrBpt+tcMAvxfHpSqWu+O79gi6E=; b=xZaYOuj06DcbEBoPoFM5T1nvVNm4j3d2k/3286uBVsuCMh/U3Wl5Kda7dGSi9KqCwTgs7P NEcjPtl0HrE0RMBQ== Authentication-Results: smtp-out1.suse.de; none 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=kpsR+medd31H4BwjTrBpt+tcMAvxfHpSqWu+O79gi6E=; b=E55b9vOcAwiUBH3xQm0KP8aFwxkZL9/xlYfZEgqD54g4sSY/Gke7lQ3YHVD/p++BXghLwd nUYxtSJnRK6bjbXrz5tS5wuWK/xgjc31B7Fcz7V/d9mqrmhHkQFJRFl8AfR9a9Ii6f/Enx 99pTTcrYXPG0HSPdGU9LfOoYAaWGdII= 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=kpsR+medd31H4BwjTrBpt+tcMAvxfHpSqWu+O79gi6E=; b=xZaYOuj06DcbEBoPoFM5T1nvVNm4j3d2k/3286uBVsuCMh/U3Wl5Kda7dGSi9KqCwTgs7P NEcjPtl0HrE0RMBQ== 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 9E6A713A21 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 IGssJQfBTGbJGwAAD6G6ig (envelope-from ) for ; Tue, 21 May 2024 15:43:03 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 07/11] [gdb/macros] Workaround gcc PR debug/115066 Date: Tue, 21 May 2024 17:44:11 +0200 Message-Id: <20240521154415.9543-7-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-Level: X-Spamd-Result: default: False [-2.80 / 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)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_TLS_ALL(0.00)[] X-Spam-Score: -2.80 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, 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 gcc 14, we run into: ... (gdb) p FIRST^M No symbol "FIRST" in current context.^M (gdb) FAIL: gdb.base/fission-macro.exp: dwarf_version=4: dwarf_bits=32: \ strict_dwarf=0: p FIRST ... This is because gcc 14 is missing the fix for gcc PR debug/115066, which is basically the dwarf-4 variant of dwarf-5 gcc PR debug/99319, for which we already have a workaround. Likewise, work around this problem for v4 dwarf. 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/cu.c | 1 + gdb/dwarf2/cu.h | 1 + gdb/dwarf2/macro.c | 6 ++++-- gdb/dwarf2/read.c | 11 +++++++++++ gdb/dwarf2/read.h | 4 ++++ gdb/testsuite/gdb.base/fission-macro-i.exp | 4 ---- gdb/testsuite/gdb.base/fission-macro.exp | 4 ---- 7 files changed, 21 insertions(+), 10 deletions(-) diff --git a/gdb/dwarf2/cu.c b/gdb/dwarf2/cu.c index e51ac900ea3..9a5ee59bbcf 100644 --- a/gdb/dwarf2/cu.c +++ b/gdb/dwarf2/cu.c @@ -35,6 +35,7 @@ dwarf2_cu::dwarf2_cu (dwarf2_per_cu_data *per_cu, producer_is_gxx_lt_4_6 (false), producer_is_gcc_lt_4_3 (false), producer_is_gcc_lt_11 (false), + producer_is_gcc_lt_15 (false), producer_is_gcc_11 (false), producer_is_icc (false), producer_is_icc_lt_14 (false), diff --git a/gdb/dwarf2/cu.h b/gdb/dwarf2/cu.h index 190d395159d..875b0250e3e 100644 --- a/gdb/dwarf2/cu.h +++ b/gdb/dwarf2/cu.h @@ -257,6 +257,7 @@ struct dwarf2_cu bool producer_is_gxx_lt_4_6 : 1; bool producer_is_gcc_lt_4_3 : 1; bool producer_is_gcc_lt_11 : 1; + bool producer_is_gcc_lt_15 : 1; bool producer_is_gcc_11 : 1; bool producer_is_icc : 1; bool producer_is_icc_lt_14 : 1; diff --git a/gdb/dwarf2/macro.c b/gdb/dwarf2/macro.c index fd081f3c1f9..10daca2cc54 100644 --- a/gdb/dwarf2/macro.c +++ b/gdb/dwarf2/macro.c @@ -481,7 +481,8 @@ dwarf_decode_macro_bytes (dwarf2_per_objfile *per_objfile, mac_ptr++; if (section_is_gnu && cu->dwo_unit != nullptr - && cu->per_cu->version () >= 5 && producer_is_gcc_lt_11 (cu)) + && ((cu->per_cu->version () <= 4 && producer_is_gcc_lt_15 (cu)) + || (cu->per_cu->version () >= 5 && producer_is_gcc_lt_11 (cu)))) { if (macinfo_type == DW_MACRO_define_strp) macinfo_type = DW_MACRO_define_strx; @@ -860,7 +861,8 @@ dwarf_decode_macros (dwarf2_per_objfile *per_objfile, mac_ptr++; if (section_is_gnu && cu->dwo_unit != nullptr - && cu->per_cu->version () >= 5 && producer_is_gcc_lt_11 (cu)) + && ((cu->per_cu->version () <= 4 && producer_is_gcc_lt_15 (cu)) + || (cu->per_cu->version () >= 5 && producer_is_gcc_lt_11 (cu)))) { if (macinfo_type == DW_MACRO_define_strp) macinfo_type = DW_MACRO_define_strx; diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index e5f65ad28f2..6a489502f8b 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -7278,6 +7278,16 @@ producer_is_gcc_lt_11 (struct dwarf2_cu *cu) return cu->producer_is_gcc_lt_11; } +/* See dwarf2/read.h. */ +bool +producer_is_gcc_lt_15 (struct dwarf2_cu *cu) +{ + if (!cu->checked_producer) + check_producer (cu); + + return cu->producer_is_gcc_lt_15; +} + /* See dwarf2/read.h. */ bool producer_is_clang (struct dwarf2_cu *cu) @@ -11310,6 +11320,7 @@ check_producer (struct dwarf2_cu *cu) cu->producer_is_gxx_lt_4_6 = major < 4 || (major == 4 && minor < 6); cu->producer_is_gcc_lt_4_3 = major < 4 || (major == 4 && minor < 3); cu->producer_is_gcc_lt_11 = major < 11; + cu->producer_is_gcc_lt_15 = major < 15; cu->producer_is_gcc_11 = major == 11; } else if (producer_is_icc (cu->producer, &major, &minor)) diff --git a/gdb/dwarf2/read.h b/gdb/dwarf2/read.h index 7fca859c43d..d61985e4916 100644 --- a/gdb/dwarf2/read.h +++ b/gdb/dwarf2/read.h @@ -822,6 +822,10 @@ extern void dwarf2_get_section_info (struct objfile *, gcc 11. */ extern bool producer_is_gcc_lt_11 (struct dwarf2_cu *cu); +/* Return true if the producer of the inferior is gcc, and earlier than + gcc 15. */ +extern bool producer_is_gcc_lt_15 (struct dwarf2_cu *cu); + /* Return true if the producer of the inferior is clang. */ extern bool producer_is_clang (struct dwarf2_cu *cu); diff --git a/gdb/testsuite/gdb.base/fission-macro-i.exp b/gdb/testsuite/gdb.base/fission-macro-i.exp index 62304f9b69e..01eb8c9ea84 100644 --- a/gdb/testsuite/gdb.base/fission-macro-i.exp +++ b/gdb/testsuite/gdb.base/fission-macro-i.exp @@ -66,10 +66,6 @@ proc do_tests { dwarf_version dwarf_bits strict_dwarf } { } 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 9e5d5c0a0d5..2434a329b7e 100644 --- a/gdb/testsuite/gdb.base/fission-macro.exp +++ b/gdb/testsuite/gdb.base/fission-macro.exp @@ -67,10 +67,6 @@ proc do_tests { dwarf_version dwarf_bits strict_dwarf } { } 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