From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id xBGHKe9r52kwQTAAWB0awg (envelope-from ) for ; Tue, 21 Apr 2026 08:22:07 -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=Al+tl5cI; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=oEnVV8U+; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Al+tl5cI; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=oEnVV8U+; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 9ACFD1E0C3; Tue, 21 Apr 2026 08:22:07 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.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,RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.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 E93AC1E067 for ; Tue, 21 Apr 2026 08:22:06 -0400 (EDT) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 1FBDF4B9DB59 for ; Tue, 21 Apr 2026 12:22:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1FBDF4B9DB59 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=Al+tl5cI; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=oEnVV8U+; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Al+tl5cI; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=oEnVV8U+ Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2a07:de40:b251:101:10:150:64:2]) by sourceware.org (Postfix) with ESMTPS id 5CA6E4BA23F2 for ; Tue, 21 Apr 2026 12:21:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5CA6E4BA23F2 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 5CA6E4BA23F2 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:2 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1776774101; cv=none; b=bCMjKFxhwv5V8C2UkJ91GT0GXMUHT6lPxhWlmiNEVJO5PqjLtnbOYJHDkRb8l01CJJ7X2jY4mYf8lTIBwtM+JPQm8uC9ilNQ2QSU/jzvqEcfKdNBKGGM0p3Xvwu9eBi3FKYjX9ltNuGe9NOyhCRXWJJ7qWWM4h++VN894EW1jmY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1776774101; c=relaxed/simple; bh=6Rf++cruZrYia7BQbKD0yBMXRVUMC0qW8+G6YJU7jgU=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=Ons+GzV8TJddOXnkUYHUoszoXP+9rIBxfBQKiYCaEhkKA0QkG61xmgPfzRjJwA4fFAH2wIdb8kPBipzDN3g3qtqwVVet7hKbt9SUDO39MCBxKmZbtoarRdRR9xjx2OibEYFsVnGiymXKL4ptsyc86NDjOiuOsdJzluMYk3b0fMg= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5CA6E4BA23F2 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 5E24F5BD26 for ; Tue, 21 Apr 2026 12:21:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1776774100; 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=61v4O0+JlKhhK5Y4u0BeTkmd6qxlqeMCkSKjYozp2GE=; b=Al+tl5cIHfGN+lJkqQQ6Hq79Vst+VlKGcBDNAE8Q30d7nyS0/lrAgYPt+Ue8OyB61hzzAd Er5Ja9bt7Pcdmi6HMo8jdg2wF1IMd7Up+rGHjkIHglMo5+7PBne6U2Uot0ZhXx5cVQdehu rEcGzW0WmCHTRm4DV1c4D7fwLNO9BI4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1776774100; 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=61v4O0+JlKhhK5Y4u0BeTkmd6qxlqeMCkSKjYozp2GE=; b=oEnVV8U+N1zUpoPFVZ+ECSn3urC0Cn3OeRdkBHTP3CE1/7RekQ6vyEKN6TomXzIdvim7VQ jieSfHz1PvswBICQ== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=Al+tl5cI; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=oEnVV8U+ DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1776774100; 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=61v4O0+JlKhhK5Y4u0BeTkmd6qxlqeMCkSKjYozp2GE=; b=Al+tl5cIHfGN+lJkqQQ6Hq79Vst+VlKGcBDNAE8Q30d7nyS0/lrAgYPt+Ue8OyB61hzzAd Er5Ja9bt7Pcdmi6HMo8jdg2wF1IMd7Up+rGHjkIHglMo5+7PBne6U2Uot0ZhXx5cVQdehu rEcGzW0WmCHTRm4DV1c4D7fwLNO9BI4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1776774100; 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=61v4O0+JlKhhK5Y4u0BeTkmd6qxlqeMCkSKjYozp2GE=; b=oEnVV8U+N1zUpoPFVZ+ECSn3urC0Cn3OeRdkBHTP3CE1/7RekQ6vyEKN6TomXzIdvim7VQ jieSfHz1PvswBICQ== 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 49CA1593AF for ; Tue, 21 Apr 2026 12:21:40 +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 ClK3ENRr52nPSwAAD6G6ig (envelope-from ) for ; Tue, 21 Apr 2026 12:21:40 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH] [gdb] Simplify frame_follow_static_link Date: Tue, 21 Apr 2026 14:21:39 +0200 Message-ID: <20260421122139.243506-1-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Action: no action X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[99.99%]; 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)[]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; RCPT_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+]; FUZZY_RATELIMITED(0.00)[rspamd.com]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FROM_HAS_DN(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_TLS_ALL(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]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Queue-Id: 5E24F5BD26 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 In frame_follow_static_link, I noticed: ... if (frame_block == nullptr) return {}; frame_block = frame_block->function_block (); const struct dynamic_prop *static_link = frame_block->static_link (); ... This is the only use of block::static_link, so simplify frame_follow_static_link by merging the call to function_block into block::static_link. Tested on aarch64-linux. --- gdb/block.c | 8 +++++--- gdb/block.h | 2 +- gdb/frame.c | 2 -- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gdb/block.c b/gdb/block.c index dc00327048f..e7424c52aff 100644 --- a/gdb/block.c +++ b/gdb/block.c @@ -357,13 +357,15 @@ struct dynamic_prop * block::static_link () const { struct objfile *objfile = this->objfile (); + const struct block *function_block = this->function_block (); - /* Only objfile-owned blocks that materialize top function scopes can have + /* Only objfile-owned blocks that materialize function scopes can have static links. */ - if (objfile == NULL || function () == NULL) + if (objfile == NULL || function_block == NULL) return NULL; - return (struct dynamic_prop *) objfile_lookup_static_link (objfile, this); + return (struct dynamic_prop *) objfile_lookup_static_link (objfile, + function_block); } /* See block.h. */ diff --git a/gdb/block.h b/gdb/block.h index 091120ae2b8..cd02006f860 100644 --- a/gdb/block.h +++ b/gdb/block.h @@ -301,7 +301,7 @@ struct block : public allocate_on_obstack DW_AT_static_link attribute) for a function is a way to get the frame corresponding to the enclosing function. - Note that only objfile-owned and function-level blocks can have a + Note that only objfile-owned and in-function blocks can have a static link. Return NULL if there is no such property. */ struct dynamic_prop *static_link () const; diff --git a/gdb/frame.c b/gdb/frame.c index 7a83f5e61c0..61d37316c6a 100644 --- a/gdb/frame.c +++ b/gdb/frame.c @@ -3241,8 +3241,6 @@ frame_follow_static_link (const frame_info_ptr &initial_frame) if (frame_block == nullptr) return {}; - frame_block = frame_block->function_block (); - const struct dynamic_prop *static_link = frame_block->static_link (); if (static_link == nullptr) return {}; base-commit: c365a263f5dcf95982464cf6d53db00cc6f04c1c -- 2.51.0