This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[patch +const 2/2] Unify lookup_symbol_in_objfile_symtabs
- From: Jan Kratochvil <jan dot kratochvil at redhat dot com>
- To: gdb-patches at sourceware dot org
- Date: Wed, 3 Dec 2014 18:07:03 +0100
- Subject: [patch +const 2/2] Unify lookup_symbol_in_objfile_symtabs
- Authentication-results: sourceware.org; auth=none
2014-12-03 Jan Kratochvil <jan.kratochvil@redhat.com>
* symtab.c (lookup_symbol_in_objfile_symtabs): New declaration.
(lookup_global_symbol_from_objfile): Call it.
diff --git a/gdb/symtab.c b/gdb/symtab.c
index 79035f6..1951c97 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -79,6 +79,11 @@ struct symbol *lookup_local_symbol (const char *name,
const domain_enum domain,
enum language language);
+static struct symbol *
+ lookup_symbol_in_objfile_symtabs (const struct objfile *objfile,
+ int block_index, const char *name,
+ const domain_enum domain);
+
static
struct symbol *lookup_symbol_via_quick_fns (struct objfile *objfile,
int block_index,
@@ -1546,24 +1551,12 @@ lookup_global_symbol_from_objfile (const struct objfile *main_objfile,
objfile;
objfile = objfile_separate_debug_iterate (main_objfile, objfile))
{
- struct compunit_symtab *cust;
struct symbol *sym;
-
- /* Go through symtabs. */
- ALL_OBJFILE_COMPUNITS (objfile, cust)
- {
- const struct blockvector *bv;
- const struct block *block;
-
- bv = COMPUNIT_BLOCKVECTOR (cust);
- block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
- sym = block_lookup_symbol (block, name, domain);
- if (sym)
- {
- block_found = block;
- return fixup_symbol_section (sym, objfile);
- }
- }
+
+ sym = lookup_symbol_in_objfile_symtabs (objfile, GLOBAL_BLOCK, name,
+ domain);
+ if (sym != NULL)
+ return sym;
sym = lookup_symbol_via_quick_fns ((struct objfile *) objfile,
GLOBAL_BLOCK, name, domain);