public inbox for gdb-cvs@sourceware.org help / color / mirror / Atom feed
From: Markus Metzger <mmetzger@sourceware.org> To: gdb-cvs@sourceware.org Subject: [binutils-gdb] gdb, symtab: inline find_quick_global_symbol_language Date: Tue, 18 Oct 2022 13:25:43 +0000 (GMT) [thread overview] Message-ID: <20221018132543.9FD963858C83@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=531bd03892bbf95f346819006b365c0b0ccb6d06 commit 531bd03892bbf95f346819006b365c0b0ccb6d06 Author: Markus Metzger <markus.t.metzger@intel.com> Date: Mon May 2 16:33:32 2022 +0200 gdb, symtab: inline find_quick_global_symbol_language 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. Diff: --- gdb/symtab.c | 43 +++++++++++++++++++------------------------ 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/gdb/symtab.c b/gdb/symtab.c index 50ee87ee0a9..7bb32242c1b 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); }
reply other threads:[~2022-10-18 13:25 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20221018132543.9FD963858C83@sourceware.org \ --to=mmetzger@sourceware.org \ --cc=gdb-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).