From patchwork Wed Mar 6 15:53:15 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: 86878 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 032AC3858030 for ; Wed, 6 Mar 2024 15:53:04 +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 [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id B9CAC3858D34 for ; Wed, 6 Mar 2024 15:52:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B9CAC3858D34 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 B9CAC3858D34 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709740365; cv=none; b=cLkP9uIcpm35z43PPPG4eL9DQr4jFCLlUceyNpyQ/5Luba4TgVmqSCdn7Ut+wc/ZBMGQPcvOsfCnduX7xZFAF1QfQxplCTLMoCYv7MJQNVV1PcXE8RVFq6z7rUxQPXaUjZvpVw4dgqjRZxglBbTpHqWs6lGiolyp+E4CLkNAG2s= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709740365; c=relaxed/simple; bh=3m2kuIRoXVJag8EodV5iycFLJhz4XY4sQfF7iklRRNA=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=R3qyDuw5MV4/2QvS4/5y9+7Gs9mvcuhrT1XWJq/Zq/zqISyJQawAdPCg+xOcQGji/F/JiVl+zV1yImSKZpNiPXNl7qNsShJPZMWPfhcE1IHLBVOqVzJBuZ5LeRV40LAb9x1sfCf97HfteKaa/JPp6gKjJX8ixYpmV91gV87g0a0= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [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 9468D3F790 for ; Wed, 6 Mar 2024 15:52:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1709740362; 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=4wIw0iHxNw+/JaXtKCa81Y6LCIg5HScUzeiGNJ9RGQI=; b=oPtbh4qCtQxnyWG04Hce4aK48A9/c3mkYNPn7VcLvgz14G4khcVp2oxZT5B8XKWm0w62Ne 3nd6OPv6rc85t4rv9NmcN+Htx0fSV19IohQZgb3anq2AXpQcpcR2UXlYtKUXfe7OgRenMW bX+LujAvpC5+khiFW8Utrh0eQNzJevg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1709740362; 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=4wIw0iHxNw+/JaXtKCa81Y6LCIg5HScUzeiGNJ9RGQI=; b=21HUpWbnOmViSmO8aq0gDlRWBklyDZkXIWj0AxL8XlMECKkDeu7ddx3ChFQkiyG3IpRRrA cq6ndhZsCHcm30CA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1709740362; 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=4wIw0iHxNw+/JaXtKCa81Y6LCIg5HScUzeiGNJ9RGQI=; b=oPtbh4qCtQxnyWG04Hce4aK48A9/c3mkYNPn7VcLvgz14G4khcVp2oxZT5B8XKWm0w62Ne 3nd6OPv6rc85t4rv9NmcN+Htx0fSV19IohQZgb3anq2AXpQcpcR2UXlYtKUXfe7OgRenMW bX+LujAvpC5+khiFW8Utrh0eQNzJevg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1709740362; 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=4wIw0iHxNw+/JaXtKCa81Y6LCIg5HScUzeiGNJ9RGQI=; b=21HUpWbnOmViSmO8aq0gDlRWBklyDZkXIWj0AxL8XlMECKkDeu7ddx3ChFQkiyG3IpRRrA cq6ndhZsCHcm30CA== 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 7BABA13A65 for ; Wed, 6 Mar 2024 15:52:42 +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 wTUkHEqR6GWeXQAAD6G6ig (envelope-from ) for ; Wed, 06 Mar 2024 15:52:42 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH] [gdb/symtab] Workaround PR gas/31115 Date: Wed, 6 Mar 2024 16:53:15 +0100 Message-Id: <20240306155315.22240-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Authentication-Results: smtp-out1.suse.de; none X-Spamd-Result: default: False [1.90 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; BROKEN_CONTENT_TYPE(1.50)[]; RCPT_COUNT_ONE(0.00)[1]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_NONE(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; MID_CONTAINS_FROM(1.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%] X-Spam-Score: 1.90 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, T_SCC_BODY_TEXT_LINE 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 On arm-linux, with gas 2.40, I run into: ... (gdb) x /i main+8^M 0x4e1 : vrhadd.u16 d14, d14, d31^M (gdb) FAIL: gdb.arch/pr25124.exp: disassemble thumb instruction (1st try) ... This is a regression due to PR gas/31115, which makes gas produce a low_pc with the thumb bit set (0x4d8 & 0x1): ... <1><24>: Abbrev Number: 2 (DW_TAG_subprogram) <25> DW_AT_name : main <29> DW_AT_external : 1 <29> DW_AT_type : <0x2f> <2a> DW_AT_low_pc : 0x4d9 <2e> DW_AT_high_pc : 12 ... The regression was introduced in 2.39, and is also present in 2.40 and 2.41, and hasn't been fixed yet. Work around this in read_func_scope, by using gdbarch_addr_bits_remove on low_pc and high_pc. Tested on arm-linux and x86_64-linux. PR tdep/31453 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31453 --- gdb/dwarf2/cu.c | 1 + gdb/dwarf2/cu.h | 1 + gdb/dwarf2/read.c | 22 ++++++++++++++++++++++ 3 files changed, 24 insertions(+) base-commit: 164cc86b81de7ab25682a234b978134d08fb3009 diff --git a/gdb/dwarf2/cu.c b/gdb/dwarf2/cu.c index ae46dd2a9b2..62c0a8a3ede 100644 --- a/gdb/dwarf2/cu.c +++ b/gdb/dwarf2/cu.c @@ -42,6 +42,7 @@ dwarf2_cu::dwarf2_cu (dwarf2_per_cu_data *per_cu, producer_is_clang (false), producer_is_gas_lt_2_38 (false), producer_is_gas_2_39 (false), + producer_is_gas_ge_2_40 (false), processing_has_namespace_info (false) { } diff --git a/gdb/dwarf2/cu.h b/gdb/dwarf2/cu.h index ad89228ef8d..58e89960aad 100644 --- a/gdb/dwarf2/cu.h +++ b/gdb/dwarf2/cu.h @@ -263,6 +263,7 @@ struct dwarf2_cu bool producer_is_clang : 1; bool producer_is_gas_lt_2_38 : 1; bool producer_is_gas_2_39 : 1; + bool producer_is_gas_ge_2_40 : 1; /* When true, the file that we're processing is known to have debugging info for C++ namespaces. GCC 3.3.x did not produce diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 486be7e4921..34985898b6a 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -148,6 +148,7 @@ static int dwarf2_loclist_block_index; static int ada_block_index; static bool producer_is_gas_lt_2_38 (struct dwarf2_cu *cu); +static bool producer_is_gas_ge_2_39 (struct dwarf2_cu *cu); /* Size of .debug_loclists section header for 32-bit DWARF format. */ #define LOCLIST_HEADER_SIZE32 12 @@ -9974,6 +9975,15 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu) lowpc = per_objfile->relocate (unrel_low); highpc = per_objfile->relocate (unrel_high); + if (gdbarch_bfd_arch_info (gdbarch)->arch == bfd_arch_arm + && producer_is_gas_ge_2_39 (cu)) + { + /* Gas version 2.39 produces DWARF for a Thumb subprogram with a low_pc + attribute with the thumb bit set (PR gas/31115). Work around this. */ + lowpc = gdbarch_addr_bits_remove (gdbarch, lowpc); + highpc = gdbarch_addr_bits_remove (gdbarch, highpc); + } + /* If we have any template arguments, then we must allocate a different sort of symbol. */ for (child_die = die->child; child_die; child_die = child_die->sibling) @@ -11326,6 +11336,7 @@ check_producer (struct dwarf2_cu *cu) { cu->producer_is_gas_lt_2_38 = major < 2 || (major == 2 && minor < 38); cu->producer_is_gas_2_39 = major == 2 && minor == 39; + cu->producer_is_gas_ge_2_40 = major > 2 || (major == 2 && minor >= 40); } else { @@ -11380,6 +11391,17 @@ producer_is_gas_2_39 (struct dwarf2_cu *cu) return cu->producer_is_gas_2_39; } +/* Return true if CU is produced by GAS 2.39 or later. */ + +static bool +producer_is_gas_ge_2_39 (struct dwarf2_cu *cu) +{ + if (!cu->checked_producer) + check_producer (cu); + + return cu->producer_is_gas_2_39 || cu->producer_is_gas_ge_2_40; +} + /* Return the accessibility of DIE, as given by DW_AT_accessibility. If that attribute is not available, return the appropriate default. */