MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simplify use of map_matching_symbols in ada-lang.c

Browse Source 
I noticed that ada-lang.c creates a lambda to call
aux_add_nonlocal_symbols.  However, this code can be simplified a bit
by changing match_data to implement operator(), and then simply
passing the object as the callback.  That is what this patch
implements.

gdb/ChangeLog
2021-03-26  Tom Tromey  <tom@tromey.com>

	* ada-lang.c (struct match_data): Add operator().
	(match_data::operator()): Rename from aux_add_nonlocal_symbols.
	(callback): Remove 'callback'.
This commit is contained in:
Tom Tromey 2021-03-26 13:44:24 -06:00
parent e2cd5ca40c
commit 2315bb2d57
2 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/ChangeLog
View File

@ -1,3 +1,9 @@
2021-03-26 Tom Tromey <tom@tromey.com>
* ada-lang.c (struct match_data): Add operator().
(match_data::operator()): Rename from aux_add_nonlocal_symbols.
(callback): Remove 'callback'.
2021-03-26 Tom Tromey <tom@tromey.com> 2021-03-26 Tom Tromey <tom@tromey.com>
* psymtab.c (psymbol_functions::expand_symtabs_matching): Only * psymtab.c (psymbol_functions::expand_symtabs_matching): Only

46
gdb/ada-lang.c
View File

@ -4970,7 +4970,7 @@ ada_add_local_symbols (std::vector<struct block_symbol> &result,
add_symbols_from_enclosing_procs (result, lookup_name, domain); add_symbols_from_enclosing_procs (result, lookup_name, domain);
} }
/* An object of this type is used as the user_data argument when /* An object of this type is used as the callback argument when
calling the map_matching_symbols method. */ calling the map_matching_symbols method. */
struct match_data struct match_data
@ -4981,48 +4981,43 @@ struct match_data
} }
DISABLE_COPY_AND_ASSIGN (match_data); DISABLE_COPY_AND_ASSIGN (match_data);
bool operator() (struct block_symbol *bsym);
struct objfile *objfile = nullptr; struct objfile *objfile = nullptr;
std::vector<struct block_symbol> *resultp; std::vector<struct block_symbol> *resultp;
struct symbol *arg_sym = nullptr; struct symbol *arg_sym = nullptr;
bool found_sym = false; bool found_sym = false;
}; };
/* A callback for add_nonlocal_symbols that adds symbol, found in BSYM, /* A callback for add_nonlocal_symbols that adds symbol, found in
to a list of symbols. DATA is a pointer to a struct match_data * BSYM, to a list of symbols. */
containing the vector that collects the symbol list, the file that SYM
must come from, a flag indicating whether a non-argument symbol has
been found in the current block, and the last argument symbol
passed in SYM within the current block (if any). When SYM is null,
marking the end of a block, the argument symbol is added if no
other has been found. */
static bool bool
aux_add_nonlocal_symbols (struct block_symbol *bsym, match_data::operator() (struct block_symbol *bsym)
struct match_data *data)
{ {
const struct block *block = bsym->block; const struct block *block = bsym->block;
struct symbol *sym = bsym->symbol; struct symbol *sym = bsym->symbol;
if (sym == NULL) if (sym == NULL)
{ {
if (!data->found_sym && data->arg_sym != NULL) if (!found_sym && arg_sym != NULL)
add_defn_to_vec (*data->resultp, add_defn_to_vec (*resultp,
fixup_symbol_section (data->arg_sym, data->objfile), fixup_symbol_section (arg_sym, objfile),
block); block);
data->found_sym = false; found_sym = false;
data->arg_sym = NULL; arg_sym = NULL;
} }
else else
{ {
if (SYMBOL_CLASS (sym) == LOC_UNRESOLVED) if (SYMBOL_CLASS (sym) == LOC_UNRESOLVED)
return true; return true;
else if (SYMBOL_IS_ARGUMENT (sym)) else if (SYMBOL_IS_ARGUMENT (sym))
data->arg_sym = sym; arg_sym = sym;
else else
{ {
data->found_sym = true; found_sym = true;
add_defn_to_vec (*data->resultp, add_defn_to_vec (*resultp,
fixup_symbol_section (sym, data->objfile), fixup_symbol_section (sym, objfile),
block); block);
} }
} }
@ -5194,16 +5189,11 @@ add_nonlocal_symbols (std::vector<struct block_symbol> &result,
bool is_wild_match = lookup_name.ada ().wild_match_p (); bool is_wild_match = lookup_name.ada ().wild_match_p ();
auto callback = [&] (struct block_symbol *bsym)
{
return aux_add_nonlocal_symbols (bsym, &data);
};
for (objfile *objfile : current_program_space->objfiles ()) for (objfile *objfile : current_program_space->objfiles ())
{ {
data.objfile = objfile; data.objfile = objfile;
objfile->map_matching_symbols (lookup_name, domain, global, callback, objfile->map_matching_symbols (lookup_name, domain, global, data,
is_wild_match ? NULL : compare_names); is_wild_match ? NULL : compare_names);
for (compunit_symtab *cu : objfile->compunits ()) for (compunit_symtab *cu : objfile->compunits ())
@ -5226,7 +5216,7 @@ add_nonlocal_symbols (std::vector<struct block_symbol> &result,
for (objfile *objfile : current_program_space->objfiles ()) for (objfile *objfile : current_program_space->objfiles ())
{ {
data.objfile = objfile; data.objfile = objfile;
objfile->map_matching_symbols (name1, domain, global, callback, objfile->map_matching_symbols (name1, domain, global, data,
compare_names); compare_names);
} }
} }