From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 124946 invoked by alias); 3 Aug 2019 01:04:22 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 124934 invoked by uid 89); 3 Aug 2019 01:04:21 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-23.5 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_STOCKGEN,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.1 spammy=our X-HELO: mail-vk1-f202.google.com Received: from mail-vk1-f202.google.com (HELO mail-vk1-f202.google.com) (209.85.221.202) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 03 Aug 2019 01:04:19 +0000 Received: by mail-vk1-f202.google.com with SMTP id j140so33016359vke.10 for ; Fri, 02 Aug 2019 18:04:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=c7hMyzHHcxpFBgVPZKz76FpFA/xEij1Vnlf8CmU7Cow=; b=Vnx8OQtalazvO6srDunEkhQ6OmkXd3RgszJEJOuNcaNzzPNR658fKmpMyoDnMVaqOq zqfVlOITRzaIadaiUOeTMX67mLFDpNXfPxR9ANCKL5Jh4AeTWEz+GfSsi19ZvOoEWS2Z CiArlfYR+mJ+NtE9wmVM0vXZdge0LxsdxsYILNhmWbHlnWv9Tm+me73PqSy/lBhyoYO4 vLCnS9BMcyuLxDXh+NeWLTL0dy32CgjPWwSJwfo8xU8RWiDr4axhqP/3iIRqT2TE7mLT Cl3HN+bIQGbaRDSpOdxgbMI/h9gpbDeKupe4SJkI7R7FCXGLG9AxSffJY8JaUSsTnS9Z RQ1w== Date: Sat, 03 Aug 2019 01:04:00 -0000 In-Reply-To: Message-Id: <20190803010414.34872-1-cbiesinger@google.com> Mime-Version: 1.0 References: Subject: [PATCH] Factor out the common code in lookup_{static,global}_symbol From: "Christian Biesinger via gdb-patches" Reply-To: Christian Biesinger To: gdb-patches@sourceware.org Cc: Christian Biesinger Content-Type: text/plain; charset="UTF-8" X-SW-Source: 2019-08/txt/msg00059.txt.bz2 Thanks for the suggestion, that does seem better. The two functions are extremely similar; this factors out their code into a shared _internal function. gdb/ChangeLog: 2019-08-02 Christian Biesinger * symtab.c (lookup_static_symbol): Call the new function (and move it down to be next to lookup_global_symbol). (struct global_sym_lookup_data): Add block_enum member. (lookup_symbol_global_iterator_cb): Pass block_index instead of GLOBAL_BLOCK to lookup_symbol_in_objfile. (lookup_global_symbol_internal): New function. (lookup_global_symbol): Call new function. --- gdb/symtab.c | 81 +++++++++++++++++++++++----------------------------- 1 file changed, 36 insertions(+), 45 deletions(-) diff --git a/gdb/symtab.c b/gdb/symtab.c index 87a0c8e4da..55df92f3e0 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -2566,44 +2566,6 @@ lookup_symbol_in_objfile (struct objfile *objfile, enum block_enum block_index, return result; } -/* See symtab.h. */ - -struct block_symbol -lookup_static_symbol (const char *name, const domain_enum domain) -{ - struct symbol_cache *cache = get_symbol_cache (current_program_space); - struct block_symbol result; - struct block_symbol_cache *bsc; - struct symbol_cache_slot *slot; - - /* Lookup in STATIC_BLOCK is not current-objfile-dependent, so just pass - NULL for OBJFILE_CONTEXT. */ - result = symbol_cache_lookup (cache, NULL, STATIC_BLOCK, name, domain, - &bsc, &slot); - if (result.symbol != NULL) - { - if (SYMBOL_LOOKUP_FAILED_P (result)) - return {}; - return result; - } - - for (objfile *objfile : current_program_space->objfiles ()) - { - result = lookup_symbol_in_objfile (objfile, STATIC_BLOCK, name, domain); - if (result.symbol != NULL) - { - /* Still pass NULL for OBJFILE_CONTEXT here. */ - symbol_cache_mark_found (bsc, slot, NULL, result.symbol, - result.block); - return result; - } - } - - /* Still pass NULL for OBJFILE_CONTEXT here. */ - symbol_cache_mark_not_found (bsc, slot, NULL, name, domain); - return {}; -} - /* Private data to be used with lookup_symbol_global_iterator_cb. */ struct global_sym_lookup_data @@ -2614,6 +2576,9 @@ struct global_sym_lookup_data /* The domain to use for our search. */ domain_enum domain; + /* The block index in which to search */ + enum block_enum block_index; + /* The field where the callback should store the symbol if found. It should be initialized to {NULL, NULL} before the search is started. */ struct block_symbol result; @@ -2634,7 +2599,7 @@ lookup_symbol_global_iterator_cb (struct objfile *objfile, gdb_assert (data->result.symbol == NULL && data->result.block == NULL); - data->result = lookup_symbol_in_objfile (objfile, GLOBAL_BLOCK, + data->result = lookup_symbol_in_objfile (objfile, data->block_index, data->name, data->domain); /* If we found a match, tell the iterator to stop. Otherwise, @@ -2642,12 +2607,14 @@ lookup_symbol_global_iterator_cb (struct objfile *objfile, return (data->result.symbol != NULL); } -/* See symtab.h. */ - +/* This function contains the common code of lookup_{global,static}_symbol. + BLOCK is only used if BLOCK_INDEX is GLOBAL_SCOPE, in which case it is + used to retrieve the objfile to start the lookup in. */ struct block_symbol -lookup_global_symbol (const char *name, - const struct block *block, - const domain_enum domain) +lookup_global_symbol_internal (const char *name, + enum block_enum block_index, + const struct block *block, + const domain_enum domain) { struct symbol_cache *cache = get_symbol_cache (current_program_space); struct block_symbol result; @@ -2656,11 +2623,14 @@ lookup_global_symbol (const char *name, struct block_symbol_cache *bsc; struct symbol_cache_slot *slot; + gdb_assert (block_index == GLOBAL_BLOCK || block_index == STATIC_BLOCK); + gdb_assert (block == nullptr || block_index == GLOBAL_BLOCK); + objfile = lookup_objfile_from_block (block); /* First see if we can find the symbol in the cache. This works because we use the current objfile to qualify the lookup. */ - result = symbol_cache_lookup (cache, objfile, GLOBAL_BLOCK, name, domain, + result = symbol_cache_lookup (cache, objfile, block_index, name, domain, &bsc, &slot); if (result.symbol != NULL) { @@ -2678,6 +2648,7 @@ lookup_global_symbol (const char *name, { memset (&lookup_data, 0, sizeof (lookup_data)); lookup_data.name = name; + lookup_data.block_index = block_index; lookup_data.domain = domain; gdbarch_iterate_over_objfiles_in_search_order (objfile != NULL ? get_objfile_arch (objfile) : target_gdbarch (), @@ -2693,6 +2664,26 @@ lookup_global_symbol (const char *name, return result; } +/* See symtab.h. */ + +struct block_symbol +lookup_static_symbol (const char *name, const domain_enum domain) +{ + /* TODO: Should static symbol lookup start with a block as well, so we can + prefer a static symbol in the current CU? */ + return lookup_global_symbol_internal (name, STATIC_BLOCK, nullptr, domain); +} + +/* See symtab.h. */ + +struct block_symbol +lookup_global_symbol (const char *name, + const struct block *block, + const domain_enum domain) +{ + return lookup_global_symbol_internal (name, GLOBAL_BLOCK, block, domain); +} + int symbol_matches_domain (enum language symbol_language, domain_enum symbol_domain, -- 2.22.0.770.g0f2c4a37fd-goog