From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id wSQGC727JmpoKTwAWB0awg (envelope-from ) for ; Mon, 08 Jun 2026 08:55:25 -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=Yw832out; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=EOgZDHDH; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Am6Ve9GE; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=sIo7NB5P; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 224B31E0A3; Mon, 08 Jun 2026 08:55:25 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-5.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [IPv6:2620:52:6:3111::32]) (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 A26281E062 for ; Mon, 08 Jun 2026 08:55:24 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 08CAF51A4304 for ; Mon, 8 Jun 2026 12:55:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 08CAF51A4304 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Yw832out; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=EOgZDHDH; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Am6Ve9GE; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=sIo7NB5P Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id EC0394B19723 for ; Mon, 8 Jun 2026 12:54:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EC0394B19723 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 EC0394B19723 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1780923262; cv=none; b=kmoMG45yCBl/nNoF3BDEQ+7HzR7G434NNlD6BsmEbEh9LkGyXOTj8sGO6vCQ6kz52j855tArmF5j8o/wT1mylqw8TRw5oMwT4NVi4XQ3C33SxxtUMykSQUXNj95IQ1C5dAZ44cd0oNrF6GEJ3HoiMRP7WDsdXAIAJrkKutNWYkY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1780923262; c=relaxed/simple; bh=guL07LtnR2o/808pdgJLJ+SAhc1nggwuncwZIGXYpLE=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=ZxqN+K9qyJyN3ApRDQo1EV6MSH9EswX/7fIGiRDumOfQPjEnVzuhQWUWSq50w/nkKW967195X6w4toH4QARW6VASg36VuxiDTnVbeTarPkjVkNeOyXtbm+ZCfVVarkdIFr2Dl5Qxanpnb3JjrTy5PWjKN6r72XkkFXvNL2JnKf4= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Yw832out; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=EOgZDHDH; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Am6Ve9GE; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=sIo7NB5P DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EC0394B19723 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 E32976784E for ; Mon, 8 Jun 2026 12:54:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1780923261; 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=kRPKXkP2VkCqxE8aBtZXwfeQ5/VjM1tA76HryEiUNNI=; b=Yw832outerlwNj0HUm2V2H8p68227QAHjDBrYQXKC9B6D/Rh1Sl7wqsXDR6GtGihDDdter 2pNDN47rcw998pS4ew1fbZPDer1vRHdnBAgEx00ZGFvgkLYngB5ZiTUxS8Co6AZ1tVjh7f KDzMUGm5GQIXs6vN2tYRPo46x1n3PvQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1780923261; 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=kRPKXkP2VkCqxE8aBtZXwfeQ5/VjM1tA76HryEiUNNI=; b=EOgZDHDHJyq8v4Le6Ap56NDjFVYPT4IgMnq/ZNfiIEtJ9S79UuzMGbTDjWDd9FuDHPjRk2 JMPn6EgG3d38Y5Cg== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=Am6Ve9GE; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=sIo7NB5P DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1780923260; 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=kRPKXkP2VkCqxE8aBtZXwfeQ5/VjM1tA76HryEiUNNI=; b=Am6Ve9GEKbkNN51Y5LFLlwURq9Jo3BZ7fA7RdsPKNLLnwjAxbMMTMVxCjHSS2++YVShnLM LlgiGfM7A4zM0Gvw4sGKJv2w31BrM/NmZrmadpxXxStwe/tX0YNSOq3nzz9zzx0iY6BJQL 5O+zzewx980AzZ9j7TpEwbzgBxBD5sQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1780923260; 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=kRPKXkP2VkCqxE8aBtZXwfeQ5/VjM1tA76HryEiUNNI=; b=sIo7NB5PCcLelZvUPJpIJh8LVthX13OVRczP22L7oSy8fR85Ql6wdPK7c2mOJxZRDu520T oJ/bqAqW/gbpZnDg== 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 CCC87779A9 for ; Mon, 8 Jun 2026 12:54:20 +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 QP6aMHy7Jmr9WQAAD6G6ig (envelope-from ) for ; Mon, 08 Jun 2026 12:54:20 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 1/3] [gdb/contrib] Fix KeyError in dwarf-to-dwarf-assembler.py Date: Mon, 8 Jun 2026 14:54:18 +0200 Message-ID: <20260608125420.2318026-2-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260608125420.2318026-1-tdevries@suse.de> References: <20260608125420.2318026-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Action: no action X-Rspamd-Queue-Id: E32976784E X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[99.99%]; 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)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.de:+]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_TLS_ALL(0.00)[]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:104:10:150:64:97:from,2a07:de40:b281:106:10:150:64:167:received]; RCVD_VIA_SMTP_AUTH(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid, suse.de:dkim, imap1.dmz-prg2.suse.org:rdns, imap1.dmz-prg2.suse.org:helo] X-Rspamd-Server: rspamd1.dmz-prg2.suse.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 Executable outputs/gdb.threads/stepi-over-clone/stepi-over-clone contains the following DWARF (using readelf -w): ... <31c5> DW_AT_const_value : 8 byte block: ff ff ff ff ff ff ff ff ... or more explicit using llvm-dwarfdump -v: ... DW_AT_const_value [DW_FORM_block1] \ (<0x08> ff ff ff ff ff ff ff ff ) ... Before commit 18ad8c1a54d ("Emit DWARF expressions from dwarf-to-dwarf-assembler.py"), the dwarf-to-dwarf-assembler.py script generated: ... DW_AT_const_value { MANUAL: Fill expr list } SPECIAL_expr ... for this. But since the commit, we run into a KeyError. The problem is that we're trying to interpret some random data as a DWARF expression. Fix this by special-casing DW_AT_const_value, and generating instead: ... DW_AT_const_value "\xff\xff\xff\xff\xff\xff\xff\xff" DW_FORM_block1 ... which mimics the style I found in gdb.dwarf2/info-locals-optimized-out.exp: ... DW_TAG_variable { DW_AT_name const_bytes DW_AT_type :$int_type_label DW_AT_const_value "\x01\x01\x01\x01" DW_FORM_block1 } ... Likewise for DW_AT_discr_list. Another case for which the KeyError triggers, is DWARF from outputs/gdb.ada/array_of_variant/p-minimal: ... <2><14a4>: Abbrev Number: 20 (DW_TAG_structure_type) <14a5> DW_AT_name : p__payload_t <14a9> DW_AT_byte_size : 18 byte block: \ fd 63 14 0 0 97 94 1 99 45 0 0 0 23 7 9 fc 1a \ (DW_OP_GNU_variable_value: <0x1463>; \ DW_OP_push_object_address; \ DW_OP_deref_size: 1; \ DW_OP_call4: <0x1421>; \ DW_OP_plus_uconst: 7; \ DW_OP_const1s: -4; DW_OP_and) ... because the pyelftools version that I'm using doesn't support DW_OP_GNU_variable_value yet (supported starting v0.33). Fix this by catching the KeyError, and falling back to the string case: ... DW_AT_byte_size \ "\xfd\x63\x14\x00\x00\x97\x94\x01\x99\x45\x00\x00\x00\x23\x07\x09\xfc\x1a" \ DW_FORM_exprloc # Failed to print op as DWARF expression: 0xfd ... --- gdb/contrib/dwarf-to-dwarf-assembler.py | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/gdb/contrib/dwarf-to-dwarf-assembler.py b/gdb/contrib/dwarf-to-dwarf-assembler.py index 314a9e9587b..fa32bc4bbab 100755 --- a/gdb/contrib/dwarf-to-dwarf-assembler.py +++ b/gdb/contrib/dwarf-to-dwarf-assembler.py @@ -226,9 +226,23 @@ class DWARFAttribute: elif self.name == "DW_AT_encoding" and isinstance(self.value, int): s += "@" + ATE_NAME[self.value] elif self.form in EXPR_ATTRIBUTE_FORMS: - # This returns a complete description that is already - # indented. - return self._format_expr_value(s, indent_count) + postfix = "" + if self.name not in ["DW_AT_const_value", "DW_AT_discr_list"]: + # Try to print as a DWARF expression. + try: + # This returns a complete description that is already + # indented. + return self._format_expr_value(s, indent_count) + except KeyError as e: + # Fall through to basic printing. + postfix = " # Failed to print op as DWARF expression: " + hex( + int(str(e)) + ) + # Print the data as a string in "\x01\x02\x03\x04" format. + result = "" + for op in self.value: + result += f"\\x{op:02x}" + return indent(s, indent_count) + '"' + result + '" ' + self.form + postfix else: s += self._format_value(offset_die_lookup) -- 2.51.0