From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by sourceware.org (Postfix) with ESMTPS id A6DE3384B833 for ; Thu, 2 Jun 2022 14:29:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A6DE3384B833 X-IronPort-AV: E=McAfee;i="6400,9594,10365"; a="336622181" X-IronPort-AV: E=Sophos;i="5.91,271,1647327600"; d="scan'208";a="336622181" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Jun 2022 07:29:11 -0700 X-IronPort-AV: E=Sophos;i="5.91,271,1647327600"; d="scan'208";a="680667094" Received: from labpc2407.iul.intel.com (HELO localhost) ([172.28.50.61]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Jun 2022 07:29:10 -0700 From: Markus Metzger To: gdb-patches@sourceware.org Subject: [PATCH v5 09/15] gdb, ada: update ada_lookup_simple_minsym Date: Thu, 2 Jun 2022 15:25:08 +0200 Message-Id: <20220602132514.957983-10-markus.t.metzger@intel.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220602132514.957983-1-markus.t.metzger@intel.com> References: <20220602132514.957983-1-markus.t.metzger@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jun 2022 14:29:18 -0000 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 (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 &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 Intel Deutschland GmbH Registered Address: Am Campeon 10, 85579 Neubiberg, Germany Tel: +49 89 99 8853-0, www.intel.de Managing Directors: Christin Eisenschmid, Sharon Heck, Tiffany Doon Silva Chairperson of the Supervisory Board: Nicole Lau Registered Office: Munich Commercial Register: Amtsgericht Muenchen HRB 186928