* objfiles.h (ALL_OBJFILE_PRIMARY_SYMTABS): New macro.

(ALL_PRIMARY_SYMTABS): Use it.
	(ALL_PSPACE_PRIMARY_SYMTABS): Ditto.
	* dwarf2read.c (dw2_find_symbol_file): Ditto.
	* linespec.c (iterate_over_all_matching_symtabs): Ditto.
	* symtab.c (lookup_symbol_aux_objfile): Ditto.
	(basic_lookup_transparent_type): Ditto.
This commit is contained in:
Doug Evans
2012-06-04 02:57:28 +00:00
parent bb3a4c1019
commit d790cf0a9c
5 changed files with 61 additions and 53 deletions

View File

@@ -987,27 +987,24 @@ iterate_over_all_matching_symtabs (struct linespec_state *state,
ALL_DOMAIN,
&matcher_data);
ALL_OBJFILE_SYMTABS (objfile, symtab)
ALL_OBJFILE_PRIMARY_SYMTABS (objfile, symtab)
{
if (symtab->primary)
struct block *block;
block = BLOCKVECTOR_BLOCK (BLOCKVECTOR (symtab), STATIC_BLOCK);
LA_ITERATE_OVER_SYMBOLS (block, name, domain, callback, data);
if (include_inline)
{
struct block *block;
struct symbol_and_data_callback cad = { callback, data };
int i;
block = BLOCKVECTOR_BLOCK (BLOCKVECTOR (symtab), STATIC_BLOCK);
LA_ITERATE_OVER_SYMBOLS (block, name, domain, callback, data);
if (include_inline)
for (i = FIRST_LOCAL_BLOCK;
i < BLOCKVECTOR_NBLOCKS (BLOCKVECTOR (symtab)); i++)
{
struct symbol_and_data_callback cad = { callback, data };
int i;
for (i = FIRST_LOCAL_BLOCK;
i < BLOCKVECTOR_NBLOCKS (BLOCKVECTOR (symtab)); i++)
{
block = BLOCKVECTOR_BLOCK (BLOCKVECTOR (symtab), i);
LA_ITERATE_OVER_SYMBOLS (block, name, domain,
iterate_inline_only, &cad);
}
block = BLOCKVECTOR_BLOCK (BLOCKVECTOR (symtab), i);
LA_ITERATE_OVER_SYMBOLS (block, name, domain,
iterate_inline_only, &cad);
}
}
}