gdb: rename partial_symtab::read_dependencies to expand_dependencies

This method calls partial_symtab::expand_psymtab on all dependencies of
a psymtab.  Given that there is also a partial_symtab::read_symtab
method, I think it would be clearer to name this function
expand_dependencies, rather than read_dependencies.

gdb/ChangeLog:

	* psympriv.h (partial_symtab) <read_dependencies>: Rename to...
	<expand_dependencies>: ... this.
	* psymtab.c (partial_symtab::read_dependencies): Rename to...
	(partial_symtab::expand_dependencies): ... this.
	* dwarf2/read.c (dwarf2_include_psymtab) <expand_psymtab>:
	Update.
	(dwarf2_psymtab::expand_psymtab): Update.
	* dbxread.c (dbx_psymtab_to_symtab_1): Update.
	* mdebugread.c (psymtab_to_symtab_1): Update.
	* xcoffread.c (xcoff_psymtab_to_symtab_1): Update.
This commit is contained in:
Simon Marchi 2020-03-29 15:23:48 -04:00
parent 3ad830466f
commit 48993951ce
7 changed files with 20 additions and 7 deletions

View File

@ -1,3 +1,16 @@
2020-03-29 Simon Marchi <simon.marchi@polymtl.ca>
* psympriv.h (partial_symtab) <read_dependencies>: Rename to...
<expand_dependencies>: ... this.
* psymtab.c (partial_symtab::read_dependencies): Rename to...
(partial_symtab::expand_dependencies): ... this.
* dwarf2/read.c (dwarf2_include_psymtab) <expand_psymtab>:
Update.
(dwarf2_psymtab::expand_psymtab): Update.
* dbxread.c (dbx_psymtab_to_symtab_1): Update.
* mdebugread.c (psymtab_to_symtab_1): Update.
* xcoffread.c (xcoff_psymtab_to_symtab_1): Update.
2020-03-29 Simon Marchi <simon.marchi@polymtl.ca>
* psympriv.h (discard_psymtab): Remove.

View File

@ -2071,7 +2071,7 @@ dbx_psymtab_to_symtab_1 (legacy_psymtab *pst, struct objfile *objfile)
gdb_assert (!pst->readin);
/* Read in all partial symtabs on which this one is dependent. */
pst->read_dependencies (objfile);
pst->expand_dependencies (objfile);
if (LDSYMLEN (pst)) /* Otherwise it's a dummy. */
{

View File

@ -5840,7 +5840,7 @@ struct dwarf2_include_psymtab : public partial_symtab
return;
/* It's an include file, no symbols to read for it.
Everything is in the parent symtab. */
read_dependencies (objfile);
expand_dependencies (objfile);
m_readin = true;
}
@ -8775,7 +8775,7 @@ dwarf2_psymtab::expand_psymtab (struct objfile *objfile)
if (readin)
return;
read_dependencies (objfile);
expand_dependencies (objfile);
dw2_do_instantiate_symtab (per_cu_data, false);
gdb_assert (get_compunit_symtab () != nullptr);

View File

@ -3856,7 +3856,7 @@ psymtab_to_symtab_1 (legacy_psymtab *pst, struct objfile *objfile)
/* Read in all partial symtabs on which this one is dependent.
NOTE that we do have circular dependencies, sigh. We solved
that by setting pst->readin before this point. */
pst->read_dependencies (objfile);
pst->expand_dependencies (objfile);
/* Do nothing if this is a dummy psymtab. */

View File

@ -134,7 +134,7 @@ struct partial_symtab
virtual void expand_psymtab (struct objfile *) = 0;
/* Ensure that all the dependencies are read in. */
void read_dependencies (struct objfile *);
void expand_dependencies (struct objfile *);
/* Return true if the symtab corresponding to this psymtab has been
readin. */

View File

@ -1706,7 +1706,7 @@ partial_symtab::partial_symtab (const char *filename_, struct objfile *objfile)
/* See psympriv.h. */
void
partial_symtab::read_dependencies (struct objfile *objfile)
partial_symtab::expand_dependencies (struct objfile *objfile)
{
for (int i = 0; i < number_of_dependencies; ++i)
{

View File

@ -1826,7 +1826,7 @@ xcoff_psymtab_to_symtab_1 (legacy_psymtab *pst, struct objfile *objfile)
gdb_assert (!pst->readin);
/* Read in all partial symtabs on which this one is dependent. */
pst->read_dependencies (objfile);
pst->expand_dependencies (objfile);
if (((struct symloc *) pst->read_symtab_private)->numsyms != 0)
{