From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from omta039.useast.a.cloudfilter.net (omta039.useast.a.cloudfilter.net [44.202.169.38]) by sourceware.org (Postfix) with ESMTPS id E1ED73858D1E for ; Fri, 1 Sep 2023 23:28:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E1ED73858D1E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from eig-obgw-6002a.ext.cloudfilter.net ([10.0.30.222]) by cmsmtp with ESMTP id c6IhqQeb4yYOwcDZOqDCTD; Fri, 01 Sep 2023 23:28:54 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id cDZNq39hlG5f2cDZNqBrHR; Fri, 01 Sep 2023 23:28:53 +0000 X-Authority-Analysis: v=2.4 cv=L8YO/sf8 c=1 sm=1 tr=0 ts=64f273b5 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=OWjo9vPv0XrRhIrVQ50Ab3nP57M=:19 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=zNV7Rl7Rt7sA:10 a=Qbun_eYptAEA:10 a=b7ZIfV_DAgCnqWaEg3QA:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:Message-ID:Date:Subject: Cc:To:From:Sender:Reply-To:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=KPFlm3dIUaI/9fQZeRqmWd2BDR0sbyDH0j7exvTPThc=; b=W05DCZaDwHOKwhlESBdTkK1EDv ZK9NyjKTa6Zm5FBPn+9Yhboqz83qfSAc5TR+JdpQe+bhVmvEgRgxlcEwjV62FcW1YBVpiosWQfg1t wLQ9t3v47cJ1hwJ1wf8QEn1ex; Received: from 75-166-150-212.hlrn.qwest.net ([75.166.150.212]:43972 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1qcDZN-003lHL-0F; Fri, 01 Sep 2023 17:28:53 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] Simplify block_find_symbol Date: Fri, 1 Sep 2023 17:28:43 -0600 Message-ID: <20230901232843.3050666-1-tom@tromey.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: 75.166.150.212 X-Source-L: No X-Exim-ID: 1qcDZN-003lHL-0F X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-150-212.hlrn.qwest.net (localhost.localdomain) [75.166.150.212]:43972 X-Source-Auth: tom+tromey.com X-Email-Count: 1 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfFTFCH+OqcRP2vSAdf1MYsrfJ9srJNXBQCjyxNkWqlFx1lwp7ntBfIPcOJr9ApR97DpHjfT4507lJLUIsaOAEHkCeHnp9KikN2BuwIREbRs28kr4CRrA 8ghKiWQkmLlcPEXyEHrcTqDA5yiJ5WR0irssKzXZ/EWCryMWmeof546LKyg13HGlvjUIFMCzdiLQMT+hR2dGiC0VWLLxVOTk6lQ= X-Spam-Status: No, score=-3024.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,GIT_PATCH_0,JMQ_SPF_NEUTRAL,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 List-Id: block_find_symbol takes a callback function, but only two callbacks are ever passed to it -- and they are similar enough that it seems cleaner to just have block_find_symbol do the work itself. Also, block_find_symbol can take a lookup_name_info as an argument, following the general idea of pushing the construction of these objects as high in the call chain as feasible. Regression tested on x86-64 Fedora 38. --- gdb/block.c | 43 +++++++++++-------------------------------- gdb/block.h | 36 ++++++------------------------------ gdb/symfile-debug.c | 10 +++------- gdb/symtab.c | 13 +++++++------ 4 files changed, 27 insertions(+), 75 deletions(-) diff --git a/gdb/block.c b/gdb/block.c index 8e1b6ec88d4..6ada69c388f 100644 --- a/gdb/block.c +++ b/gdb/block.c @@ -778,46 +778,25 @@ block_lookup_symbol_primary (const struct block *block, const char *name, /* See block.h. */ struct symbol * -block_find_symbol (const struct block *block, const char *name, - const domain_enum domain, - block_symbol_matcher_ftype *matcher, void *data) +block_find_symbol (const struct block *block, const lookup_name_info &name, + const domain_enum domain, struct symbol **stub) { - 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); - for (struct symbol *sym : block_iterator_range (block, &lookup_name)) + for (struct symbol *sym : block_iterator_range (block, &name)) { - /* MATCHER is deliberately called second here so that it never sees - a non-domain-matching symbol. */ - if (sym->matches (domain) - && matcher (sym, data)) - return sym; - } - return NULL; -} - -/* See block.h. */ + if (!sym->matches (domain)) + continue; -int -block_find_non_opaque_type (struct symbol *sym, void *data) -{ - return !TYPE_IS_OPAQUE (sym->type ()); -} - -/* See block.h. */ - -int -block_find_non_opaque_type_preferred (struct symbol *sym, void *data) -{ - struct symbol **best = (struct symbol **) data; + if (!TYPE_IS_OPAQUE (sym->type ())) + return sym; - if (!TYPE_IS_OPAQUE (sym->type ())) - return 1; - *best = sym; - return 0; + if (stub != nullptr) + *stub = sym; + } + return nullptr; } /* See block.h. */ diff --git a/gdb/block.h b/gdb/block.h index f132d351bb6..3a197e63754 100644 --- a/gdb/block.h +++ b/gdb/block.h @@ -556,39 +556,15 @@ extern struct symbol *block_lookup_symbol_primary (const struct block *block, const char *name, const domain_enum domain); -/* The type of the MATCHER argument to block_find_symbol. */ - -typedef int (block_symbol_matcher_ftype) (struct symbol *, void *); - -/* Find symbol NAME in BLOCK and in DOMAIN that satisfies MATCHER. - DATA is passed unchanged to MATCHER. - BLOCK must be STATIC_BLOCK or GLOBAL_BLOCK. */ +/* Find symbol NAME in BLOCK and in DOMAIN. This will return a + matching symbol whose type is not a "opaque", see TYPE_IS_OPAQUE. + If STUB is non-NULL, an otherwise matching symbol whose type is a + opaque will be stored here. */ extern struct symbol *block_find_symbol (const struct block *block, - const char *name, + const lookup_name_info &name, const domain_enum domain, - block_symbol_matcher_ftype *matcher, - void *data); - -/* A matcher function for block_find_symbol to find only symbols with - non-opaque types. */ - -extern int block_find_non_opaque_type (struct symbol *sym, void *data); - -/* A matcher function for block_find_symbol to prefer symbols with - non-opaque types. The way to use this function is as follows: - - struct symbol *with_opaque = NULL; - struct symbol *sym - = block_find_symbol (block, name, domain, - block_find_non_opaque_type_preferred, &with_opaque); - - At this point if SYM is non-NULL then a non-opaque type has been found. - Otherwise, if WITH_OPAQUE is non-NULL then an opaque type has been found. - Otherwise, the symbol was not found. */ - -extern int block_find_non_opaque_type_preferred (struct symbol *sym, - void *data); + struct symbol **stub); /* Given a vector of pairs, allocate and build an obstack allocated blockranges struct for a block. */ diff --git a/gdb/symfile-debug.c b/gdb/symfile-debug.c index 9db5c47a8ce..233cf3390e5 100644 --- a/gdb/symfile-debug.c +++ b/gdb/symfile-debug.c @@ -260,23 +260,19 @@ objfile::lookup_symbol (block_enum kind, const char *name, domain_enum domain) const struct blockvector *bv = stab->blockvector (); const struct block *block = bv->block (kind); - sym = block_find_symbol (block, name, domain, - block_find_non_opaque_type_preferred, - &with_opaque); + sym = block_find_symbol (block, lookup_name, domain, &with_opaque); /* Some caution must be observed with overloaded functions and methods, since the index will not contain any overload information (but NAME might contain it). */ - if (sym != NULL - && symbol_matches_search_name (sym, lookup_name)) + if (sym != nullptr) { retval = stab; /* Found it. */ return false; } - if (with_opaque != NULL - && symbol_matches_search_name (with_opaque, lookup_name)) + if (with_opaque != nullptr) retval = stab; /* Keep looking through other psymtabs. */ diff --git a/gdb/symtab.c b/gdb/symtab.c index d8ce2bf8482..29ca418d1e9 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -2675,9 +2675,10 @@ basic_lookup_transparent_type_quick (struct objfile *objfile, bv = cust->blockvector (); block = bv->block (block_index); - sym = block_find_symbol (block, name, STRUCT_DOMAIN, - block_find_non_opaque_type, NULL); - if (sym == NULL) + + lookup_name_info lookup_name (name, symbol_name_match_type::FULL); + sym = block_find_symbol (block, lookup_name, STRUCT_DOMAIN, nullptr); + if (sym == nullptr) error_in_psymtab_expansion (block_index, name, cust); gdb_assert (!TYPE_IS_OPAQUE (sym->type ())); return sym->type (); @@ -2696,13 +2697,13 @@ basic_lookup_transparent_type_1 (struct objfile *objfile, const struct block *block; const struct symbol *sym; + lookup_name_info lookup_name (name, symbol_name_match_type::FULL); for (compunit_symtab *cust : objfile->compunits ()) { bv = cust->blockvector (); block = bv->block (block_index); - sym = block_find_symbol (block, name, STRUCT_DOMAIN, - block_find_non_opaque_type, NULL); - if (sym != NULL) + sym = block_find_symbol (block, lookup_name, STRUCT_DOMAIN, nullptr); + if (sym != nullptr) { gdb_assert (!TYPE_IS_OPAQUE (sym->type ())); return sym->type (); -- 2.41.0