From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by sourceware.org (Postfix) with ESMTPS id 9F04B384B833 for ; Thu, 2 Jun 2022 14:29:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9F04B384B833 X-IronPort-AV: E=McAfee;i="6400,9594,10365"; a="276039287" X-IronPort-AV: E=Sophos;i="5.91,271,1647327600"; d="scan'208";a="276039287" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Jun 2022 07:29:22 -0700 X-IronPort-AV: E=Sophos;i="5.91,271,1647327600"; d="scan'208";a="612843381" Received: from labpc2407.iul.intel.com (HELO localhost) ([172.28.50.61]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Jun 2022 07:29:21 -0700 From: Markus Metzger To: gdb-patches@sourceware.org Subject: [PATCH v5 13/15] gdb, symtab: inline find_quick_global_symbol_language Date: Thu, 2 Jun 2022 15:25:12 +0200 Message-Id: <20220602132514.957983-14-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=-10.0 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:25 -0000 There is only one use of find_quick_global_symbol_language that calls it for the special symbol "main". Inline the function as it is probably not correct in the general case where we may have multiple instances of global symbols with the same name but different languages in different libraries in different linker namespaces. Further, change the objfiles iteration into a call to gdbarch_iterate_over_objfiles_in_search_order, which would only search the initial linker namespace, where we expect "main" to be located. --- gdb/symtab.c | 43 +++++++++++++++++++------------------------ 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/gdb/symtab.c b/gdb/symtab.c index 8564986f66d..11dac0f4432 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -2610,23 +2610,6 @@ lookup_symbol_in_objfile (struct objfile *objfile, enum block_enum block_index, return result; } -/* Find the language for partial symbol with NAME. */ - -static enum language -find_quick_global_symbol_language (const char *name, const domain_enum domain) -{ - for (objfile *objfile : current_program_space->objfiles ()) - { - bool symbol_found_p; - enum language lang - = objfile->lookup_global_symbol_language (name, domain, &symbol_found_p); - if (symbol_found_p) - return lang; - } - - return language_unknown; -} - /* This function contains the common code of lookup_{global,static}_symbol. OBJFILE is only used if BLOCK_INDEX is GLOBAL_SCOPE, in which case it is the objfile to start the lookup in. */ @@ -6367,13 +6350,25 @@ find_main_name (void) Fallback to "main". */ /* Try to find language for main in psymtabs. */ - enum language lang - = find_quick_global_symbol_language ("main", VAR_DOMAIN); - if (lang != language_unknown) - { - set_main_name ("main", lang); - return; - } + bool symbol_found_p = false; + gdbarch_iterate_over_objfiles_in_search_order + (target_gdbarch (), + [&symbol_found_p] (objfile *obj) + { + language lang + = obj->lookup_global_symbol_language ("main", VAR_DOMAIN, + &symbol_found_p); + if (symbol_found_p) + { + set_main_name ("main", lang); + return 1; + } + + return 0; + }, nullptr); + + if (symbol_found_p) + return; set_main_name ("main", language_unknown); } -- 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