From patchwork Tue May 21 15:44:08 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: 90610 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 DEC7D3849AD2 for ; Tue, 21 May 2024 15:43:43 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id 4F86D3858C78 for ; Tue, 21 May 2024 15:43:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4F86D3858C78 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 4F86D3858C78 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=1716306187; cv=none; b=RVd+z7kyVrj9z/wZ31SrSg96TvyZmIg/OmxOE91g8fhhgHdjValidF9/MKRW5xZBzYZBqCjsSoNnoB85QKsETflghwTr6WrQ4vVYrDCbCxNXDW03XFzlkycfw4IX1nJFXBi+FGrdk9mrv/bcxli3un2N4FqUClKb7YGTV27k8tU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1716306187; c=relaxed/simple; bh=l3zvECN8Xy6EScucAwfv4hOAG/nPhI7gNiBNM+EkATE=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=ebdX3hBHxci4YaYeItfcnGETUaqqQeB8YpcmOE4Vo8Y3P8nM5/B2pIkx1Fwt+l5Kcv5Ambv8cmAv2YVXxCGiYR6bRPk1ilUnpGPvkIKO6iajiZU1VEsOD5c4LH/AhHz7f1fnHyS2zCLnhpFu92KgIg1R9UEJIt12OXAyn6fzOqI= 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-out2.suse.de (Postfix) with ESMTPS id 5EC975C292 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=PWqTMLCrFwE5ebpM+XmRlWeMGGGkbw1YkdQZ36dSCPg=; b=OalK9GupzNedpc0DBcri37U27e0w/YGKu/Y6+H546du+K8TTLRV/2gHppS/q+Yu/rTfstF sjoPdaBOqcJAcL/d0/y39CMBADJRvglScwX+o+PYoBM57e99UdQsnMo17IZ/Q0PB5fPlT+ hOHSbPxLVauJXIAabDI9Jy0BTYia8NQ= 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=PWqTMLCrFwE5ebpM+XmRlWeMGGGkbw1YkdQZ36dSCPg=; b=lPB7mzEpn6Eq9KPY19UTDwOWnmbtLLr9LdrBiMP5OIEOy5dq+FtBaoYWI1vYSs+R5z2vWo pSnaIBFcAMV6vfAQ== Authentication-Results: smtp-out2.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=PWqTMLCrFwE5ebpM+XmRlWeMGGGkbw1YkdQZ36dSCPg=; b=OalK9GupzNedpc0DBcri37U27e0w/YGKu/Y6+H546du+K8TTLRV/2gHppS/q+Yu/rTfstF sjoPdaBOqcJAcL/d0/y39CMBADJRvglScwX+o+PYoBM57e99UdQsnMo17IZ/Q0PB5fPlT+ hOHSbPxLVauJXIAabDI9Jy0BTYia8NQ= 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=PWqTMLCrFwE5ebpM+XmRlWeMGGGkbw1YkdQZ36dSCPg=; b=lPB7mzEpn6Eq9KPY19UTDwOWnmbtLLr9LdrBiMP5OIEOy5dq+FtBaoYWI1vYSs+R5z2vWo pSnaIBFcAMV6vfAQ== 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 4A23313685 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 6N3JEAfBTGbJGwAAD6G6ig (envelope-from ) for ; Tue, 21 May 2024 15:43:03 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 04/11] [gdb/macros] Work around gcc PR debug/99319 Date: Tue, 21 May 2024 17:44:08 +0200 Message-Id: <20240521154415.9543-4-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: -2.80 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-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, 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+patchwork=sourceware.org@sourceware.org When running test-case gdb.base/fission-macro-i.exp using gcc-10 we get: ... (gdb) break -qualified main^M DW_FORM_strp pointing outside of .debug_str section [in module fission-macro-i-5-32]^M (gdb) FAIL: gdb.base/fission-macro-i.exp: dwarf_version=5: dwarf_bits=32: \ gdb_breakpoint: set breakpoint at main ... The problem is that gcc emits this in the .debug_macro.dwo section: ... .byte 0x5 # Define macro strp .uleb128 0x12 # At line number 18 .uleb128 0 # The macro: "FIRST 1" .byte 0x5 # Define macro strp .uleb128 0x13 # At line number 19 .uleb128 0x5 # The macro: "SECOND 2" ... The second operand of a DW_MACRO_define_strp is supposed be an offset into the .debug_str section, but it's actually an index into the .debug_str_offsets section: ... .long 0 # indexed string 0x0: FIRST 1 ... .long 0xba # indexed string 0x5: SECOND 2 ... In other words, gcc is actually emitting a DW_MACRO_define_strx while labeling it a DW_MACRO_define_strp. Work around this by treating it as a DW_MACRO_define_strx. Tested on x86_64-linux. Tested test-case (and gdb.base/fission-macro.exp) using a current gcc trunk build and gcc 9-14. --- gdb/dwarf2/cu.c | 1 + gdb/dwarf2/cu.h | 1 + gdb/dwarf2/macro.c | 18 ++++++++++++++++++ gdb/dwarf2/read.c | 11 +++++++++++ gdb/dwarf2/read.h | 4 ++++ gdb/testsuite/gdb.base/fission-macro-i.exp | 3 +-- 6 files changed, 36 insertions(+), 2 deletions(-) diff --git a/gdb/dwarf2/cu.c b/gdb/dwarf2/cu.c index a64cb1d8380..e51ac900ea3 100644 --- a/gdb/dwarf2/cu.c +++ b/gdb/dwarf2/cu.c @@ -34,6 +34,7 @@ dwarf2_cu::dwarf2_cu (dwarf2_per_cu_data *per_cu, checked_producer (false), producer_is_gxx_lt_4_6 (false), producer_is_gcc_lt_4_3 (false), + producer_is_gcc_lt_11 (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 58e89960aad..190d395159d 100644 --- a/gdb/dwarf2/cu.h +++ b/gdb/dwarf2/cu.h @@ -256,6 +256,7 @@ struct dwarf2_cu bool checked_producer : 1; 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_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 a511d0a3b44..fd081f3c1f9 100644 --- a/gdb/dwarf2/macro.c +++ b/gdb/dwarf2/macro.c @@ -480,6 +480,15 @@ dwarf_decode_macro_bytes (dwarf2_per_objfile *per_objfile, macinfo_type = (enum dwarf_macro_record_type) read_1_byte (abfd, mac_ptr); mac_ptr++; + if (section_is_gnu && cu->dwo_unit != nullptr + && cu->per_cu->version () >= 5 && producer_is_gcc_lt_11 (cu)) + { + if (macinfo_type == DW_MACRO_define_strp) + macinfo_type = DW_MACRO_define_strx; + else if (macinfo_type == DW_MACRO_undef_strp) + macinfo_type = DW_MACRO_undef_strx; + } + /* Note that we rely on the fact that the corresponding GNU and DWARF constants are the same. */ DIAGNOSTIC_PUSH @@ -850,6 +859,15 @@ dwarf_decode_macros (dwarf2_per_objfile *per_objfile, macinfo_type = (enum dwarf_macro_record_type) read_1_byte (abfd, mac_ptr); mac_ptr++; + if (section_is_gnu && cu->dwo_unit != nullptr + && cu->per_cu->version () >= 5 && producer_is_gcc_lt_11 (cu)) + { + if (macinfo_type == DW_MACRO_define_strp) + macinfo_type = DW_MACRO_define_strx; + else if (macinfo_type == DW_MACRO_undef_strp) + macinfo_type = DW_MACRO_undef_strx; + } + /* Note that we rely on the fact that the corresponding GNU and DWARF constants are the same. */ DIAGNOSTIC_PUSH diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 4884553000a..3c2698d6832 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -7268,6 +7268,16 @@ producer_is_gcc_lt_4_3 (struct dwarf2_cu *cu) return cu->producer_is_gcc_lt_4_3; } +/* See dwarf2/read.h. */ +bool +producer_is_gcc_lt_11 (struct dwarf2_cu *cu) +{ + if (!cu->checked_producer) + check_producer (cu); + + return cu->producer_is_gcc_lt_11; +} + /* See dwarf2/read.h. */ bool producer_is_clang (struct dwarf2_cu *cu) @@ -11299,6 +11309,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_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 7ab61528ab7..7fca859c43d 100644 --- a/gdb/dwarf2/read.h +++ b/gdb/dwarf2/read.h @@ -818,6 +818,10 @@ extern void dwarf2_get_section_info (struct objfile *, asection **, const gdb_byte **, bfd_size_type *); +/* Return true if the producer of the inferior is gcc, and earlier than + gcc 11. */ +extern bool producer_is_gcc_lt_11 (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 bf1ca206a6c..3121e1d289b 100644 --- a/gdb/testsuite/gdb.base/fission-macro-i.exp +++ b/gdb/testsuite/gdb.base/fission-macro-i.exp @@ -13,8 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . */ -# Gcc 11 is the first release containing the fix for PR debug/99319. -require {expr [gcc_major_version] >= 11} +require {expr [gcc_major_version] >= 9} # Use a .i file instead of a .c file, to make sure that we only generate one # .debug_macros section, working around gcc PR debug/111409.