yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gdb: rename compunit_primary_filetab to compunit_symtab::primary_filetab

Browse Source 
Make compunit_primary_filetab a method of compunit_symtab.

Change-Id: Iee3c4f7e36d579bf763c5bba146e5e10d6766768
This commit is contained in:
Simon Marchi 2021-11-19 20:50:59 -05:00 committed by Simon Marchi
parent 9821f3fa56
commit 0b17a4f78f
7 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gdb/dwarf2/read.c
View File

@ -3113,7 +3113,7 @@ dwarf2_base_index_functions::find_last_source_symtab (struct objfile *objfile)
if (cust == NULL)
return NULL;
return compunit_primary_filetab (cust);
return cust->primary_filetab ();
}
/* See read.h. */

2
gdb/guile/scm-block.c
View File

@ -554,7 +554,7 @@ bkscm_print_block_syms_progress_smob (SCM self, SCM port,
: i_smob->iter.d.compunit_symtab->includes[i_smob->iter.idx]);
gdbscm_printf (port, " %s",
symtab_to_filename_for_display
(compunit_primary_filetab (cust)));
(cust->primary_filetab ()));
break;
}
case FIRST_LOCAL_BLOCK:

2
gdb/psymtab.c
View File

@ -631,7 +631,7 @@ psymbol_functions::find_last_source_symtab (struct objfile *ofp)
if (cust == NULL)
return NULL;
return compunit_primary_filetab (cust);
return cust->primary_filetab ();
}
}
return NULL;

6
gdb/symfile-debug.c
View File

@ -289,7 +289,7 @@ objfile::lookup_symbol (block_enum kind, const char *name, domain_enum domain)
if (debug_symfile)
fprintf_filtered (gdb_stdlog, "qf->lookup_symbol (...) = %s\n",
retval
? debug_symtab_name (compunit_primary_filetab (retval))
? debug_symtab_name (retval->primary_filetab ())
: "NULL");
return retval;
@ -454,7 +454,7 @@ objfile::find_pc_sect_compunit_symtab (struct bound_minimal_symbol msymbol,
fprintf_filtered (gdb_stdlog,
"qf->find_pc_sect_compunit_symtab (...) = %s\n",
retval
? debug_symtab_name (compunit_primary_filetab (retval))
? debug_symtab_name (retval->primary_filetab ())
: "NULL");
return retval;
@ -495,7 +495,7 @@ objfile::find_compunit_symtab_by_address (CORE_ADDR address)
fprintf_filtered (gdb_stdlog,
"qf->find_compunit_symtab_by_address (...) = %s\n",
result
? debug_symtab_name (compunit_primary_filetab (result))
? debug_symtab_name (result->primary_filetab ())
: "NULL");
return result;

2
gdb/symmisc.c
View File

@ -860,7 +860,7 @@ maintenance_check_symtabs (const char *ignore, int from_tty)
for (compunit_symtab *cust : objfile->compunits ())
{
int found_something = 0;
struct symtab *symtab = compunit_primary_filetab (cust);
struct symtab *symtab = cust->primary_filetab ();
QUIT;

10
gdb/symtab.c
View File

@ -362,12 +362,12 @@ compunit_symtab::set_call_site_htab (htab_t call_site_htab)
/* See symtab.h. */
struct symtab *
compunit_primary_filetab (const struct compunit_symtab *cust)
compunit_symtab::primary_filetab () const
{
gdb_assert (COMPUNIT_FILETABS (cust) != NULL);
gdb_assert (this->filetabs != nullptr);
/* The primary file symtab is the first one in the list. */
return COMPUNIT_FILETABS (cust);
return this->filetabs;
}
/* See symtab.h. */
@ -375,7 +375,7 @@ compunit_primary_filetab (const struct compunit_symtab *cust)
enum language
compunit_language (const struct compunit_symtab *cust)
{
struct symtab *symtab = compunit_primary_filetab (cust);
struct symtab *symtab = cust->primary_filetab ();
/* The language of the compunit symtab is the language of its primary
source file. */
@ -2376,7 +2376,7 @@ Internal: %s symbol `%s' found in %s psymtab but not in symtab.\n\
(if a template, try specifying an instantiation: %s<type>)."),
block_index == GLOBAL_BLOCK ? "global" : "static",
name,
symtab_to_filename_for_display (compunit_primary_filetab (cust)),
symtab_to_filename_for_display (cust->primary_filetab ()),
name, name);
}

8
gdb/symtab.h
View File

@ -1459,6 +1459,9 @@ struct compunit_symtab
m_objfile = objfile;
}
/* Return the primary filetab of the compunit. */
symtab *primary_filetab () const;
/* Set m_call_site_htab. */
void set_call_site_htab (htab_t call_site_htab);
@ -1566,11 +1569,6 @@ compunit_filetabs (compunit_symtab *cu)
return symtab_range (cu->filetabs);
}
/* Return the primary symtab of CUST. */
extern struct symtab *
compunit_primary_filetab (const struct compunit_symtab *cust);
/* Return the language of CUST. */
extern enum language compunit_language (const struct compunit_symtab *cust);