From patchwork Tue Mar 11 14:12:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 107690 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 C4E593857BA7 for ; Tue, 11 Mar 2025 14:24:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C4E593857BA7 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=qkW23xsH 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 C8FE93857BA9 for ; Tue, 11 Mar 2025 14:13:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C8FE93857BA9 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 C8FE93857BA9 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=1741702403; cv=none; b=oKfYX5Uq0BihjJTCedPjibjK0bv9LfM0CtajD5sB/xXaiV0Y2zbiFrwp4TJmLza8u8+6WG0Jijp/CroBB3OSQnI66Rf6+WN59ohaFbu92JYA68GP5VoqSFiw9q40m/T6ffxa9RQk7bUbjs+OZxN9r475Bk1w6Dq0HQZA0bqnDNA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1741702403; c=relaxed/simple; bh=fWoDEh2pY9Hj1usdo0EHyBLT9/hnYser5UZQ0dWz4Hk=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=v4z0h9cIC+PLqiY9SHD85UZa7WNrynmqxAeNHSR0oJkMf6vGsIzPp7PEjFQMh2kX0yQz5wbZfP9LVUlhoUyw9wXZjkNEhdmkL+kUQ9hkiAWIoM1PEeFWOn9Wa1p7XC6RST/dTG3Rmxxta4l+VM4VxY0I5VboBgZgFlHasTltjk8= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-5003a.ext.cloudfilter.net ([10.0.29.159]) by cmsmtp with ESMTPS id rtvStqi9IzZPas0LltGGQ9; Tue, 11 Mar 2025 14:12:53 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id s0Ljtl6xjdQyls0LjtAqx6; Tue, 11 Mar 2025 14:12:51 +0000 X-Authority-Analysis: v=2.4 cv=McOnuI/f c=1 sm=1 tr=0 ts=67d044e5 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=Vs1iUdzkB0EA:10 a=ItBw4LHWJt0A:10 a=CCpqsmhAAAAA:8 a=BR18Nz92BBtRe0yN-m4A:9 a=QEXdDO2ut3YA:10 a=ul9cdbp4aOFLsgKbc677:22 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=sVmg84bIAzLo8ZTDTn9KGWH5DK23uAtHNvsgcVwVJhM=; b=qkW23xsHsOkPl3KLLFLDP8LyT7 kiHebYO/Qvuq0DOSKozQ2Urq85RFiDF3AZN4M4Dr2eVYcq7TBSVxh3yx8/fWpI/sc+l1AXh6F+adG G9EKIFs6Z8ml1OTGNDQfJ8dcr; 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 1ts0Li-000000003jP-3NoM; Tue, 11 Mar 2025 08:12:50 -0600 From: Tom Tromey Date: Tue, 11 Mar 2025 08:12:51 -0600 Subject: [PATCH 15/28] Convert ada_language_defn::collect_symbol_completion_matches MIME-Version: 1.0 Message-Id: <20250311-search-in-psyms-v1-15-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: 1ts0Li-000000003jP-3NoM 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: 16 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfHFUCnaLaJXRUzyxIwzkpCSaIMj+TZfpAzLXWiAzXWuTBj//Tb42weqRciuYfaI2zx53huQ9+DjwGZpfS+mRIP2T37GTKR8fc2jGQc6sz2+SWmYmuFZR XOqUsG5xbAT8MEyE9Xyd6TDwUbpqBaYBN9Vt931FG+InvSqpg6ULtOOIfKzlOKjHLGjpFHXVdbFK5cd6/21WXqGUkMDxvdR3Rvs= 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 converts ada_language_defn::collect_symbol_completion_matches to the callback approach, merging the search loop and the call to expand_symtabs_matching. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=16994 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=16998 --- gdb/ada-lang.c | 67 +++++++++++++++++++++++----------------------------------- 1 file changed, 27 insertions(+), 40 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 0a20bfb8c68666326b92a6b9298df09dedcf845c..3dc48125dee8aa424bc787a89323264d75837926 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -13652,20 +13652,12 @@ class ada_language : public language_defn const char *text, const char *word, enum type_code code) const override { - const struct block *b, *surrounding_static_block = 0; + const struct block *surrounding_static_block = 0; gdb_assert (code == TYPE_CODE_UNDEF); lookup_name_info lookup_name (text, name_match_type, true); - /* First, look at the partial symtab symbols. */ - expand_symtabs_matching (NULL, - lookup_name, - NULL, - NULL, - SEARCH_GLOBAL_BLOCK | SEARCH_STATIC_BLOCK, - SEARCH_ALL_DOMAINS); - /* At this point scan through the misc symbol vectors and add each symbol you find to the list. Eventually we want to ignore anything that isn't a text symbol (everything else will be @@ -13707,7 +13699,9 @@ class ada_language : public language_defn /* Search upwards from currently selected frame (so that we can complete on local vars. */ - for (b = get_selected_block (0); b != NULL; b = b->superblock ()) + for (const block *b = get_selected_block (0); + b != nullptr; + b = b->superblock ()) { if (b->is_static_block ()) surrounding_static_block = b; /* For elmin of dups */ @@ -13729,43 +13723,36 @@ class ada_language : public language_defn for (objfile *objfile : current_program_space->objfiles ()) { - for (compunit_symtab *s : objfile->compunits ()) + auto callback = [&] (compunit_symtab *s) { QUIT; - b = s->blockvector ()->global_block (); - for (struct symbol *sym : block_iterator_range (b)) + for (const block *b = s->blockvector ()->static_block (); + b != nullptr; + b = b->superblock ()) { - if (completion_skip_symbol (mode, sym)) - continue; + /* Don't do this block twice. */ + if (b == surrounding_static_block) + break; + + for (struct symbol *sym : block_iterator_range (b)) + { + if (completion_skip_symbol (mode, sym)) + continue; - completion_list_add_name (tracker, - sym->language (), - sym->linkage_name (), - lookup_name, text, word); + completion_list_add_name (tracker, + sym->language (), + sym->linkage_name (), + lookup_name, text, word); + } } - } - } - for (objfile *objfile : current_program_space->objfiles ()) - { - for (compunit_symtab *s : objfile->compunits ()) - { - QUIT; - b = s->blockvector ()->static_block (); - /* Don't do this block twice. */ - if (b == surrounding_static_block) - continue; - for (struct symbol *sym : block_iterator_range (b)) - { - if (completion_skip_symbol (mode, sym)) - continue; + return true; + }; - completion_list_add_name (tracker, - sym->language (), - sym->linkage_name (), - lookup_name, text, word); - } - } + objfile->expand_symtabs_matching + (nullptr, &lookup_name, nullptr, callback, + SEARCH_GLOBAL_BLOCK | SEARCH_STATIC_BLOCK, + SEARCH_ALL_DOMAINS); } }