From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id cSJ4BIGg9GmM9AgAWB0awg (envelope-from ) for ; Fri, 01 May 2026 08:45:53 -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=Q5/VgeiN; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=2NL+lnay; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Q5/VgeiN; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=2NL+lnay; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 1002B1E067; Fri, 01 May 2026 08:45:53 -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 96BF21E067 for ; Fri, 01 May 2026 08:45:52 -0400 (EDT) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 39A6D46A9CC8 for ; Fri, 1 May 2026 12:45:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 39A6D46A9CC8 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=Q5/VgeiN; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=2NL+lnay; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=Q5/VgeiN; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=2NL+lnay Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id E7DB04374234 for ; Fri, 1 May 2026 12:45:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E7DB04374234 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 E7DB04374234 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=1777639518; cv=none; b=U+qkiGf6lXGabb+iwaxn5Ld4swmUSOfdlzjf6N8I/Lpyrn6WZO39HBghe9A4h34D1E4u0TWmS/Xj+o5x8eAdptPzueeH1KkKWzIu7kaQUUFc/ATJVNr0MoWgWrbGIhE6uCl0bje8nPKYar0v43ACrDW6djPRZX0m+mXzKIFHRTY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1777639518; c=relaxed/simple; bh=eFItGn9feOEAfA87ctYPa+6N+WOSUqlw1pdaGMiWrSU=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=huEDtq0PKXzMHnpaQK8L1eloWMCrGqOoCfur3MWTyQ/tfTd5VowkFiocRVxm0K2wrchjjOJQaTvkCxdNldU7CLkSE33Z5Qy6x7aQfNgTIKmYTOFggQ2OQ9LxhRWFxg87wEWxGv/eHbZ6DIikQNCgOr4CD8EBUG+fMeXLiQHKjt4= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E7DB04374234 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 017405BD25 for ; Fri, 1 May 2026 12:45:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1777639506; 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=a3jUHh/O/uQjEBxqD7RmK7WWdKrWKmoq3xQcoBPMWG0=; b=Q5/VgeiNxQzaX46Kx54xbwm3B1vnM7olN27KdJAuzPjYQj3jlz1aFxO/Fq0l2i4hIBoKhA xIVdgL9/48S1QZsLwD8RXV3s2nMX8gSOOg154N1iNyT4TmOsJ+PyrhuUIEA/JHSLuQrh6U 1zaeT8vg80TpM/b+lazaIO1amx6ZFV8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1777639506; 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=a3jUHh/O/uQjEBxqD7RmK7WWdKrWKmoq3xQcoBPMWG0=; b=2NL+lnay/14eEylyLK0HF+jraS8tGuEmc8rhLXFWHTG4RgdXVoQeH3u6B1+nuO8S8o4Iwr u11HEAbYq1/QVmCw== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1777639506; 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=a3jUHh/O/uQjEBxqD7RmK7WWdKrWKmoq3xQcoBPMWG0=; b=Q5/VgeiNxQzaX46Kx54xbwm3B1vnM7olN27KdJAuzPjYQj3jlz1aFxO/Fq0l2i4hIBoKhA xIVdgL9/48S1QZsLwD8RXV3s2nMX8gSOOg154N1iNyT4TmOsJ+PyrhuUIEA/JHSLuQrh6U 1zaeT8vg80TpM/b+lazaIO1amx6ZFV8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1777639506; 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=a3jUHh/O/uQjEBxqD7RmK7WWdKrWKmoq3xQcoBPMWG0=; b=2NL+lnay/14eEylyLK0HF+jraS8tGuEmc8rhLXFWHTG4RgdXVoQeH3u6B1+nuO8S8o4Iwr u11HEAbYq1/QVmCw== 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 DE676593B2 for ; Fri, 1 May 2026 12:45:05 +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 aATwNFGg9Gn5ZwAAD6G6ig (envelope-from ) for ; Fri, 01 May 2026 12:45:05 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 02/10] [gdb] Factor out block::containing_function_block Date: Fri, 1 May 2026 14:44:56 +0200 Message-ID: <20260501124504.2233495-3-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260501124504.2233495-1-tdevries@suse.de> References: <20260501124504.2233495-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [-2.80 / 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)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,imap1.dmz-prg2.suse.org:helo]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_TLS_ALL(0.00)[] 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 Factor out new function block::containing_function_block out of block::containing_function. --- gdb/block.c | 18 ++++++++++++++---- gdb/block.h | 5 +++++ 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/gdb/block.c b/gdb/block.c index e7424c52aff..7b006617d1a 100644 --- a/gdb/block.c +++ b/gdb/block.c @@ -99,15 +99,25 @@ block::linkage_function () const /* See block.h. */ -struct symbol * -block::containing_function () const +const struct block * +block::containing_function_block () const { const block *bl = this; - while (bl->function () == NULL && bl->superblock () != NULL) + while (bl->function () == nullptr && bl->superblock () != nullptr) bl = bl->superblock (); - return bl->function (); + return bl->function () != nullptr ? bl : nullptr; +} + +/* See block.h. */ + +struct symbol * +block::containing_function () const +{ + const block *bl = containing_function_block (); + + return bl != nullptr ? bl->function () : nullptr; } /* See block.h. */ diff --git a/gdb/block.h b/gdb/block.h index cd02006f860..b70b27f6509 100644 --- a/gdb/block.h +++ b/gdb/block.h @@ -258,6 +258,11 @@ struct block : public allocate_on_obstack struct symbol *containing_function () const; + /* Return the block for the closest enclosing function, which might be an + inline function. */ + + const struct block *containing_function_block () const; + /* Return the static block associated with this block. Return NULL if block is a global block. */ -- 2.51.0