[PATCH v5 09/15] gdb, ada: update ada_lookup_simple_minsym

Markus Metzger via Gdb-patches
2022-06-02T14:34:37Z

Iterate over objfile in search order using the objfile of the context
block as current_objfile so the iteration can stay inside the block's
linker namespace.
---
gdb/ada-exp.y | 9 ++++++++-
gdb/ada-lang.c | 32 ++++++++++++++++++--------------
gdb/ada-lang.h | 3 ++-
3 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/gdb/ada-exp.y b/gdb/ada-exp.y
index 8660205809a..85569b841eb 100644
--- a/gdb/ada-exp.y
+++ b/gdb/ada-exp.y
@@ -1700,8 +1700,15 @@ write_var_or_type (struct parser_state *par_state,
}
else if (syms.empty ())
{
+ if (block == nullptr)
+ block = get_selected_block (nullptr);
+
+ struct objfile *objfile = nullptr;
+ if (block != nullptr)
+ objfile = block_objfile (block);
+
struct bound_minimal_symbol msym
- = ada_lookup_simple_minsym (decoded_name.c_str ());
+ = ada_lookup_simple_minsym (decoded_name.c_str (), objfile);
if (msym.minsym != NULL)
{
par_state->push_new<ada_var_msym_value_operation> (msym);
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 2b251693b72..20ea4c8f6aa 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -4887,7 +4887,7 @@ add_defn_to_vec (std::vector<struct block_symbol> &result,
global symbols are searched. */

struct bound_minimal_symbol
-ada_lookup_simple_minsym (const char *name)
+ada_lookup_simple_minsym (const char *name, struct objfile *objfile)
{
struct bound_minimal_symbol result;

@@ -4897,19 +4897,23 @@ ada_lookup_simple_minsym (const char *name)
symbol_name_matcher_ftype *match_name
= ada_get_symbol_name_matcher (lookup_name);

- for (objfile *objfile : current_program_space->objfiles ())
- {
- for (minimal_symbol *msymbol : objfile->msymbols ())
- {
- if (match_name (msymbol->linkage_name (), lookup_name, NULL)
- && msymbol->type () != mst_solib_trampoline)
- {
- result.minsym = msymbol;
- result.objfile = objfile;
- break;
- }
- }
- }
+ gdbarch_iterate_over_objfiles_in_search_order
+ (objfile != NULL ? objfile->arch () : target_gdbarch (),
+ [&result, lookup_name, match_name] (struct objfile *obj)
+ {
+ for (minimal_symbol *msymbol : obj->msymbols ())
+ {
+ if (match_name (msymbol->linkage_name (), lookup_name, nullptr)
+ && msymbol->type () != mst_solib_trampoline)
+ {
+ result.minsym = msymbol;
+ result.objfile = obj;
+ return 1;
+ }
+ }
+
+ return 0;
+ }, objfile);

return result;
}
diff --git a/gdb/ada-lang.h b/gdb/ada-lang.h
index 0dcdb56c198..df5df48d6c9 100644
--- a/gdb/ada-lang.h
+++ b/gdb/ada-lang.h
@@ -234,7 +234,8 @@ extern void ada_lookup_encoded_symbol
(const char *name, const struct block *block, domain_enum domain,
struct block_symbol *symbol_info);

-extern struct bound_minimal_symbol ada_lookup_simple_minsym (const char *);
+extern struct bound_minimal_symbol ada_lookup_simple_minsym (const char *,
+ objfile *);

extern int ada_scan_number (const char *, int, LONGEST *, int *);

--
2.35.3