From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id CWf/CfK96Wn9QDUAWB0awg (envelope-from ) for ; Thu, 23 Apr 2026 02:36:34 -0400 Authentication-Results: simark.ca; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=pkAwDJ1i; dkim=fail reason="signature verification failed" header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=7Et21IZH; dkim=fail reason="signature verification failed" (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=pkAwDJ1i; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=7Et21IZH; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 218A31E067; Thu, 23 Apr 2026 02:36:34 -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.1 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, 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 6108B1E067 for ; Thu, 23 Apr 2026 02:36:33 -0400 (EDT) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 025E34BBC0EF for ; Thu, 23 Apr 2026 06:36:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 025E34BBC0EF Authentication-Results: sourceware.org; dkim=fail reason="signature verification failed" (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=pkAwDJ1i; dkim=fail reason="signature verification failed" header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=7Et21IZH; dkim=fail reason="signature verification failed" (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=pkAwDJ1i; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=7Et21IZH Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id 19B514BBCD81 for ; Thu, 23 Apr 2026 06:35:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 19B514BBCD81 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 19B514BBCD81 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=1776926146; cv=none; b=f9VT0KdvAIHnjsxSz6WnohtvwkSMVL/neESfEUNUlzgvvqVeUeui+3kaoXZAJcWzFbHuhEaJW83nFjsYI/iSi++sbtUpRfhybUjAkpsIUfM4iqafMt40Dch03SlXKErE9aEtM5/KjxLgx1tEAx/k2lLg/LBF5xRH/y76pQZXN8g= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1776926146; c=relaxed/simple; bh=ylR7zCzOwXysItfoWJAABLeld0yBvEwRiChlFdssFvM=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=tH7rCJX2Y3S3h5sNj9yc0SEvAb6KR4DpAkYjwVCYNJdZQley7rhAyrvM36ESMTN+yiJQhNYppPon12DIcQvyNCiNB7posmP2qLGrPfPJpCAw4eadJin2WjQz+Ab7orINqwrzXRWbuT/2XAyZMCeWCrI9nY1Kk10q4Eur39ab064= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 19B514BBCD81 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 B7CC95BD70 for ; Thu, 23 Apr 2026 06:35:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1776926132; 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=zN5/Z2oVweM3zfa5U6cZdWotPJyvLkS3nIbHIHMrYUo=; b=pkAwDJ1ijR0Uk5EWUI5AE8Do9bs+clpSJyXlbr6z/moXTn7uTCXSoPlwcev2kY+2iSzvLc CqpVqOnM7VZX1oUgYaACJohdU8M8aY9wjd62yY4eQ98o7NdkIAeEY2oBgE1TolgMSRlzON 32NqlmAFupWEysMHwBqBHnvSNtWybRE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1776926132; 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=zN5/Z2oVweM3zfa5U6cZdWotPJyvLkS3nIbHIHMrYUo=; b=7Et21IZH8IVPdT2kWua9iI08v7hpgLukzGfUS3hx+KbXTXLGtq0iAOTx0EubmG6z3D7t0F XHx5OvdVtTANfOCQ== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1776926132; 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=zN5/Z2oVweM3zfa5U6cZdWotPJyvLkS3nIbHIHMrYUo=; b=pkAwDJ1ijR0Uk5EWUI5AE8Do9bs+clpSJyXlbr6z/moXTn7uTCXSoPlwcev2kY+2iSzvLc CqpVqOnM7VZX1oUgYaACJohdU8M8aY9wjd62yY4eQ98o7NdkIAeEY2oBgE1TolgMSRlzON 32NqlmAFupWEysMHwBqBHnvSNtWybRE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1776926132; 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=zN5/Z2oVweM3zfa5U6cZdWotPJyvLkS3nIbHIHMrYUo=; b=7Et21IZH8IVPdT2kWua9iI08v7hpgLukzGfUS3hx+KbXTXLGtq0iAOTx0EubmG6z3D7t0F XHx5OvdVtTANfOCQ== 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 EF0A4593B4 for ; Thu, 23 Apr 2026 06:35:31 +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 qFAPObO96WnpAgAAD6G6ig (envelope-from ) for ; Thu, 23 Apr 2026 06:35:31 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 5/7] [gdb] Use block::super_blocks Date: Thu, 23 Apr 2026 08:35:28 +0200 Message-ID: <20260423063530.1074175-6-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260423063530.1074175-1-tdevries@suse.de> References: <20260423063530.1074175-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)[-0.999]; 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)[imap1.dmz-prg2.suse.org:helo,suse.de:mid]; 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 Use block::super_blocks in a few locations to simplify code. --- gdb/ada-lang.c | 9 +++------ gdb/symmisc.c | 9 ++++----- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 71a338ce17e..da6c3b04dd9 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -13825,9 +13825,7 @@ class ada_language : public language_defn /* Search upwards from currently selected frame (so that we can complete on local vars. */ - for (const block *b = get_selected_block (0); - b != nullptr; - b = b->superblock ()) + for (auto b : block::super_blocks (get_selected_block (0))) { if (b->is_static_block ()) surrounding_static_block = b; /* For elmin of dups */ @@ -13852,9 +13850,8 @@ class ada_language : public language_defn auto callback = [&] (compunit_symtab *s) { QUIT; - for (const block *b = s->blockvector ()->static_block (); - b != nullptr; - b = b->superblock ()) + for (auto b + : block::super_blocks (s->blockvector ()->static_block ())) { /* Don't do this block twice. */ if (b == surrounding_static_block) diff --git a/gdb/symmisc.c b/gdb/symmisc.c index 89374bd8a2f..5a34986ebc2 100644 --- a/gdb/symmisc.c +++ b/gdb/symmisc.c @@ -961,11 +961,10 @@ block_depth (const struct block *block) { int i = 0; - while ((block = block->superblock ()) != NULL) - { - i++; - } - return i; + for (auto b [[maybe_unused]]: block::super_blocks (block)) + i++; + + return i - 1; } -- 2.51.0