From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id QvBaEuUdfGmkwRwAWB0awg (envelope-from ) for ; Thu, 29 Jan 2026 21:56:37 -0500 Authentication-Results: simark.ca; dkim=pass (2048-bit key; unprotected) header.d=polymtl.ca header.i=@polymtl.ca header.a=rsa-sha256 header.s=oct2025 header.b=J8a34TYa; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 2CB6F1E089; Thu, 29 Jan 2026 21:56:37 -0500 (EST) 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_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 914E31E089 for ; Thu, 29 Jan 2026 21:56:35 -0500 (EST) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 1C96A4BA9016 for ; Fri, 30 Jan 2026 02:56:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1C96A4BA9016 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=polymtl.ca header.i=@polymtl.ca header.a=rsa-sha256 header.s=oct2025 header.b=J8a34TYa Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id E28FE4BA23C4 for ; Fri, 30 Jan 2026 02:55:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E28FE4BA23C4 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=polymtl.ca Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=polymtl.ca ARC-Filter: OpenARC Filter v1.0.0 sourceware.org E28FE4BA23C4 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=132.207.4.11 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1769741754; cv=none; b=uyDgUStvWzA6sM2yYxPh9AkB2nUzt/i6nZHdpg5Xj6irdzI7RrJ2KNqC/S1dDDkyemeI9OGzLwsqzMua+uCbJglg1kaUf6sQ3EqZPOWs4HvKpnHvjrkKvUm2V4KWGDBY53960MvbzQzp4mMFsxUE7Q3vkITlr2zcICb+0IsXHxo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1769741754; c=relaxed/simple; bh=DiM/Y8qh1CNWkez0AoJq+vTlVyWbgcCb2Z1SUKGy2F4=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=cvuQ7WODGtO+/p0kQEFbCcKoIZ62nZMCvBKap88rTPi92buhFLHD8CXEgl+FuxPeJ01vROZ3/qnRrpShkTfKFVCon1ToKAQa4fqfQ/V1h9FZ5efkEBJxfKz5q1JQNnynU6qZMoAbLY4Yr1F8bhDeOrrRuN2C4WtFvTy65+hH3jw= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E28FE4BA23C4 Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 60U2tlva001866 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 29 Jan 2026 21:55:52 -0500 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 60U2tlva001866 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=oct2025; t=1769741752; bh=OhCVlPrpIWYTo+swySqZXaxCdIAZr03pSvHR9pgSHjQ=; h=From:To:Cc:Subject:Date:From; b=J8a34TYajOtYn3c/PgJA+XhTC5/UUah7GOWsouq3Da6YHJncL7xNxN/JjehjAMFCj +IZ2Ls+5sISGNFNYIBRmFNJ4h8fKppbA+rYgiuctkothPd5T2eSwNqVjIS1+YAEtQA SZ45g9t2y8KLrIwCLSA958k0fwzF6xkhQSW8DDZzmUPQydjukodICrb1xxUrkQQsfk MJnJfJQEHrT8d0/MZG7O/p3F+wT0Iyn7vvjtap0ipJAHxFhmQbPvvtw6VvDSCd4mVA BOlHAv8X0GJ4ZAb03ZUpA6/FAknOOgXUWu1gdaazl6mg2lCvv8Aj7zXuTn5mDh9UKL rSDAUhgyk62lQ== Received: by simark.ca (Postfix) id 234581E089; Thu, 29 Jan 2026 21:55:47 -0500 (EST) From: simon.marchi@polymtl.ca To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 1/3] gdb/block: make find_iterator_compunit_symtab a method of block_iterator Date: Thu, 29 Jan 2026 21:55:26 -0500 Message-ID: <20260130025546.322629-1-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.52.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Fri, 30 Jan 2026 02:55:47 +0000 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 From: Simon Marchi I noticed some code in bkscm_print_block_syms_progress_smob peeking a bit in the implementation details of block_iterator, and doing essentially the same thing as the existing static function find_iterator_compunit_symtab. Change find_iterator_compunit_symtab to become block_iterator::compunit_symtab, and use it in bkscm_print_block_syms_progress_smob. Change-Id: I344a2155a2edb5d278e98684c71f1ee161e8d1d4 --- gdb/block.c | 19 ++++++++----------- gdb/block.h | 4 ++++ gdb/guile/scm-block.c | 7 ++----- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/gdb/block.c b/gdb/block.c index 0ee29d9e3f26..fa2246383d1e 100644 --- a/gdb/block.c +++ b/gdb/block.c @@ -440,15 +440,14 @@ initialize_block_iterator (const struct block *block, } } -/* A helper function that finds the current compunit over whose static - or global block we should iterate. */ +/* See block.h. */ -static struct compunit_symtab * -find_iterator_compunit_symtab (struct block_iterator *iterator) +compunit_symtab * +block_iterator::compunit_symtab () const { - if (iterator->idx == -1) - return iterator->d.compunit_symtab; - return iterator->d.compunit_symtab->includes[iterator->idx]; + if (this->idx == -1) + return this->d.compunit_symtab; + return this->d.compunit_symtab->includes[this->idx]; } /* Perform a single step for a plain block iterator, iterating across @@ -466,8 +465,7 @@ block_iterator_step (struct block_iterator *iterator, int first) { if (first) { - struct compunit_symtab *cust - = find_iterator_compunit_symtab (iterator); + compunit_symtab *cust = iterator->compunit_symtab (); const struct block *block; /* Iteration is complete. */ @@ -508,8 +506,7 @@ block_iter_match_step (struct block_iterator *iterator, { if (first) { - struct compunit_symtab *cust - = find_iterator_compunit_symtab (iterator); + compunit_symtab *cust = iterator->compunit_symtab (); const struct block *block; /* Iteration is complete. */ diff --git a/gdb/block.h b/gdb/block.h index c3d060af92fb..535db5ced51d 100644 --- a/gdb/block.h +++ b/gdb/block.h @@ -553,6 +553,10 @@ extern const struct block *block_for_pc_sect (CORE_ADDR, struct obj_section *); struct block_iterator { +/* Return the compunit over whose static or global block the iterator currently + iterates. Return nullptr is the iteration is finished. */ + struct compunit_symtab *compunit_symtab () const; + /* If we're iterating over a single block, this holds the block. Otherwise, it holds the canonical compunit. */ diff --git a/gdb/guile/scm-block.c b/gdb/guile/scm-block.c index c1edd2b5782a..5db73ec917e1 100644 --- a/gdb/guile/scm-block.c +++ b/gdb/guile/scm-block.c @@ -535,16 +535,13 @@ bkscm_print_block_syms_progress_smob (SCM self, SCM port, case GLOBAL_BLOCK: case STATIC_BLOCK: { - struct compunit_symtab *cust; - gdbscm_printf (port, " %s", i_smob->iter.which == GLOBAL_BLOCK ? "global" : "static"); if (i_smob->iter.idx != -1) gdbscm_printf (port, " @%d", i_smob->iter.idx); - cust = (i_smob->iter.idx == -1 - ? i_smob->iter.d.compunit_symtab - : i_smob->iter.d.compunit_symtab->includes[i_smob->iter.idx]); + + compunit_symtab *cust = i_smob->iter.compunit_symtab (); gdbscm_printf (port, " %s", symtab_to_filename_for_display (cust->primary_filetab ())); base-commit: be3c73b4610a7ccf915daca693565bc895f3584e -- 2.52.0