From patchwork Tue Mar 11 14:12:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 107689 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D11003857B9E for ; Tue, 11 Mar 2025 14:23:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D11003857B9E Authentication-Results: sourceware.org; dkim=fail reason="signature verification failed" (768-bit key, unprotected) header.d=tromey.com header.i=@tromey.com header.a=rsa-sha256 header.s=default header.b=omlfjURl X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta036.useast.a.cloudfilter.net (omta036.useast.a.cloudfilter.net [44.202.169.35]) by sourceware.org (Postfix) with ESMTPS id CE6CE3857C7F for ; Tue, 11 Mar 2025 14:13:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CE6CE3857C7F Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org CE6CE3857C7F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=44.202.169.35 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1741702411; cv=none; b=iZ90A2yool7AKFX6GxV16qiFDuml1M+Qz66LETIa7iQMCKm/rj3lLB7nkexSVov3enwB+u3iKHH2ZT7ZjnnoYG9QaDfMM1LfOH8lccNSRtfXUI+TMIBq82Imhf6c+MWiplVRn9HBNwF37X137ai8NC8qOY/2fBUBJeVpnacYdjU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1741702411; c=relaxed/simple; bh=D0rruJJqTq8YHpSIWIbWySQCPdXl4Gbxr7Uj8aBrf/o=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=c16vqWWTuwcAI9c6yoz+SEQUiToyuxyebGWdLPz5i7J/fWr1MFcxmO2bebLK3Kx4rfzcOPM/Xf2Gw/wren31xyZz7N0xf9eh1oQLk+HelCKRNOlVu4KpuoBma5/qP1rt0BdY7mRrnZQPDYQcbdlyyxnaFAxBbvQmEGVFdF16S4Q= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-6008a.ext.cloudfilter.net ([10.0.30.227]) by cmsmtp with ESMTPS id rxzltrnP4zZPas0LttGGUr; Tue, 11 Mar 2025 14:13:01 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id s0LltRLzeWjcTs0LltGqZF; Tue, 11 Mar 2025 14:12:53 +0000 X-Authority-Analysis: v=2.4 cv=DOeJ4TNb c=1 sm=1 tr=0 ts=67d044ec a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=Vs1iUdzkB0EA:10 a=ItBw4LHWJt0A:10 a=ppPOZcq4FjCqRJXtrC0A:9 a=QEXdDO2ut3YA:10 a=6Ogn3jAGHLSNbaov7Orx:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Cc:To:In-Reply-To:References:Message-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From:Sender: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Rw7H8AI3zM97nNsxHTuhEjYDj69Kr3G248b8qC2XANg=; b=omlfjURlcz5iN5WlTpqAS/39s2 Gpn10fmdM8LWYMsFQJUJas8Uh+kjIH330xjW5CyE+PNVFIVDjxBl+7a7ciMW59MSz2kDghpgpWlGY YzTbJ9YKsFa3cd/mMhE9QP734; Received: from 97-118-51-80.hlrn.qwest.net ([97.118.51.80]:33770 helo=prentzel.local) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.1) (envelope-from ) id 1ts0Ll-000000003jP-09Di; Tue, 11 Mar 2025 08:12:53 -0600 From: Tom Tromey Date: Tue, 11 Mar 2025 08:12:57 -0600 Subject: [PATCH 21/28] Simplify block_lookup_symbol_primary MIME-Version: 1.0 Message-Id: <20250311-search-in-psyms-v1-21-d73d9be20983@tromey.com> References: <20250311-search-in-psyms-v1-0-d73d9be20983@tromey.com> In-Reply-To: <20250311-search-in-psyms-v1-0-d73d9be20983@tromey.com> To: gdb-patches@sourceware.org Cc: Tom Tromey X-Mailer: b4 0.14.2 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 97.118.51.80 X-Source-L: No X-Exim-ID: 1ts0Ll-000000003jP-09Di X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-118-51-80.hlrn.qwest.net (prentzel.local) [97.118.51.80]:33770 X-Source-Auth: tom+tromey.com X-Email-Count: 22 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfE8f3OymAqI6lsbPZD0F0JAs1lyQJcy3FaY7YdjENWN0RwExSYOY/BJsM9IKXOLL4J/h0xazgX0CE3ym7HFppNYmOBm8H5LevJu7aZPkSdi8LYdEMU6Q 4k1Ot1/2ScieC4X7i6xqO9bL9ZIPnZEjiirBmkITgvBfstQ1deRH+pb+Y16bGYIOoCPEeC2XTySytwdg8vGLsbwFOHuVRWIrVAU= X-Spam-Status: No, score=-3016.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_HOSTKARMA_BL, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.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~patchwork=sourceware.org@sourceware.org This simplifies block_lookup_symbol_primary by using block_iterator_range. --- gdb/block.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/gdb/block.c b/gdb/block.c index cf7ca6785b0c9ef4f3d809a245261d18ffaf06d8..2c07b38f8f806b8a154eb42adbd3f53a3535c57f 100644 --- a/gdb/block.c +++ b/gdb/block.c @@ -721,20 +721,14 @@ struct symbol * block_lookup_symbol_primary (const struct block *block, const char *name, const domain_search_flags domain) { - struct symbol *sym, *other; - struct mdict_iterator mdict_iter; - lookup_name_info lookup_name (name, symbol_name_match_type::FULL); /* Verify BLOCK is STATIC_BLOCK or GLOBAL_BLOCK. */ gdb_assert (block->superblock () == NULL || block->superblock ()->superblock () == NULL); - other = NULL; - for (sym = mdict_iter_match_first (block->multidict (), lookup_name, - &mdict_iter); - sym != NULL; - sym = mdict_iter_match_next (lookup_name, &mdict_iter)) + symbol *other = nullptr; + for (symbol *sym : block_iterator_range (block, &lookup_name)) { /* With the fix for PR gcc/debug/91507, we get for: ...