This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH] [Ada] Do not re-cache symbol-lookup result found from cache lookup.
- From: Joel Brobecker <brobecker at adacore dot com>
- To: gdb-patches at sourceware dot org
- Cc: Doug Evans <xdje42 at gmail dot com>
- Date: Mon, 19 Jan 2015 18:22:18 +0100
- Subject: [PATCH] [Ada] Do not re-cache symbol-lookup result found from cache lookup.
- Authentication-results: sourceware.org; auth=none
- References: <CAP9bCMTo3kOehd0Mm1k26dRDJvLbfv1mTrQLhWo4cAjPxOoMoQ at mail dot gmail dot com>
When ada-lang.c:ada_lookup_symbol_list_worker finds a match in
the symbol cache, it caches the result again, which is unecessary.
This patch fixes the code to avoid that.
gdb/ChangeLog:
PR 17856:
* ada-lang.c (ada_lookup_symbol_list_worker): Do not re-cache
results found in the cache.
Tested on x86_64-linux, no regression.
I'll push in a couple of days if no objection.
---
gdb/ada-lang.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index ccad0a0..c081c13 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -5612,14 +5612,12 @@ ada_lookup_symbol_list_worker (const char *name0, const struct block *block0,
const struct block *block;
const char *name;
const int wild_match_p = should_use_wild_match (name0);
- int cacheIfUnique;
+ int syms_from_global_search = 0;
int ndefns;
obstack_free (&symbol_list_obstack, NULL);
obstack_init (&symbol_list_obstack);
- cacheIfUnique = 0;
-
/* Search specified block and its superiors. */
name = name0;
block = block0;
@@ -5662,7 +5660,6 @@ ada_lookup_symbol_list_worker (const char *name0, const struct block *block0,
already performed this search before. If we have, then return
the same result. */
- cacheIfUnique = 1;
if (lookup_cached_symbol (name0, namespace, &sym, &block))
{
if (sym != NULL)
@@ -5670,6 +5667,8 @@ ada_lookup_symbol_list_worker (const char *name0, const struct block *block0,
goto done;
}
+ syms_from_global_search = 1;
+
/* Search symbols from all global blocks. */
add_nonlocal_symbols (&symbol_list_obstack, name, namespace, 1,
@@ -5688,10 +5687,10 @@ done:
ndefns = remove_extra_symbols (*results, ndefns);
- if (ndefns == 0 && full_search)
+ if (ndefns == 0 && full_search && syms_from_global_search)
cache_symbol (name0, namespace, NULL, NULL);
- if (ndefns == 1 && full_search && cacheIfUnique)
+ if (ndefns == 1 && full_search && syms_from_global_search)
cache_symbol (name0, namespace, (*results)[0].sym, (*results)[0].block);
ndefns = remove_irrelevant_renamings (*results, ndefns, block0);
--
1.9.1