From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1805) id 5CBA53858401; Tue, 18 Oct 2022 13:25:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5CBA53858401 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666099523; bh=finh7+HrYiT0FJRCePb2P2TWFJD3ZmqBJwgOqt6YP1c=; h=From:To:Subject:Date:From; b=TuB6A10uDUWe5WC34u0N0xU+01F8qDFA+C5HKvTdCR7YKL6X33vqMlKj2mu7mm2pJ JZY9wphzB8kYJdajW5IIQ0mxr64imVhj1/CbX47bYqotB4e+sr2e4B1nIPlQF6HgVx Azde5o1bIFqT9LBd/buqjNCQmFWkYqtB10iQfElw= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Markus Metzger To: gdb-cvs@sourceware.org Subject: [binutils-gdb] gdb, ada: update ada_lookup_simple_minsym X-Act-Checkin: binutils-gdb X-Git-Author: Markus Metzger X-Git-Refname: refs/heads/master X-Git-Oldrev: 4326580d4459f82429340f3a96a459178b9eed93 X-Git-Newrev: 06a670e280f39b0dd7fe0b0e0e21efa488c2729f Message-Id: <20221018132523.5CBA53858401@sourceware.org> Date: Tue, 18 Oct 2022 13:25:23 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D06a670e280f3= 9b0dd7fe0b0e0e21efa488c2729f commit 06a670e280f39b0dd7fe0b0e0e21efa488c2729f Author: Markus Metzger Date: Tue Apr 12 16:05:26 2022 +0200 gdb, ada: update ada_lookup_simple_minsym =20 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. Diff: --- 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 f67c221d873..3ec9e4d610c 100644 --- a/gdb/ada-exp.y +++ b/gdb/ada-exp.y @@ -1698,8 +1698,15 @@ write_var_or_type (struct parser_state *par_state, } else if (syms.empty ()) { + if (block =3D=3D nullptr) + block =3D get_selected_block (nullptr); + + struct objfile *objfile =3D nullptr; + if (block !=3D nullptr) + objfile =3D block_objfile (block); + struct bound_minimal_symbol msym - =3D ada_lookup_simple_minsym (decoded_name.c_str ()); + =3D ada_lookup_simple_minsym (decoded_name.c_str (), objfile); if (msym.minsym !=3D NULL) { par_state->push_new (msym); diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index f4d3f32d339..a24b1b5b8ef 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -4901,7 +4901,7 @@ add_defn_to_vec (std::vector &re= sult, global symbols are searched. */ =20 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; =20 @@ -4911,19 +4911,23 @@ ada_lookup_simple_minsym (const char *name) symbol_name_matcher_ftype *match_name =3D ada_get_symbol_name_matcher (lookup_name); =20 - for (objfile *objfile : current_program_space->objfiles ()) - { - for (minimal_symbol *msymbol : objfile->msymbols ()) - { - if (match_name (msymbol->linkage_name (), lookup_name, NULL) - && msymbol->type () !=3D mst_solib_trampoline) - { - result.minsym =3D msymbol; - result.objfile =3D objfile; - break; - } - } - } + gdbarch_iterate_over_objfiles_in_search_order + (objfile !=3D 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 () !=3D mst_solib_trampoline) + { + result.minsym =3D msymbol; + result.objfile =3D obj; + return 1; + } + } + + return 0; + }, objfile); =20 return result; } diff --git a/gdb/ada-lang.h b/gdb/ada-lang.h index 84c691b94ee..d9c74f0a552 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); =20 -extern struct bound_minimal_symbol ada_lookup_simple_minsym (const char *); +extern struct bound_minimal_symbol ada_lookup_simple_minsym (const char *, + objfile *); =20 extern int ada_scan_number (const char *, int, LONGEST *, int *);