mirrors/binutils-gdb
1
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-11-24 02:24:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Ada] Do not re-cache symbol-lookup result found from cache lookup.

Browse Source 
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 gdb/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.
This commit is contained in:
Joel Brobecker 2015-02-02 07:28:12 +04:00
parent 66c168ae56
commit b1eedac962
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/ChangeLog
View File

@ -1,3 +1,9 @@
2015-02-02 Joel Brobecker <brobecker@adacore.com>
PR gdb/17856:
* ada-lang.c (ada_lookup_symbol_list_worker): Do not re-cache
results found in the cache.
2015-02-02 Joel Brobecker <brobecker@adacore.com>
PR gdb/17854:

11
gdb/ada-lang.c
View File

@ -5412,14 +5412,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;
@ -5463,7 +5461,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)
@ -5471,6 +5468,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,
@ -5489,10 +5488,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);