gdb: small cleanups in dwarf2_psymtab constructors

I noticed that only one of the two dwarf2_psymtab constructors are
actually used.  The one that is used accepts an `addr` parameter (the
base text offset), but its sole caller passes a constant, 0.  We want to
keep calling the three-arguments standard_psymtab constructor form,
however, since it differs from the two-arguments form in subtle ways.

Also, I believe the dwarf2_per_cu_data associated to the created
dwarf2_psymtab should be passed as a constructor argument.  That will
help me in a future patchset, to convince myself that the `per_cu_data`
field can't be NULL.

So this patch:

- Removes the two-parameters constructor of dwarf2_psymtab, as it is
  unused.
- Removes the `addr` parameter of the remaining constructor, passing 0
  directly to the base class' constructor.
- Adds a `per_cu` parameter, to assign the `per_cu_data` field at
  construction.

gdb/ChangeLog:

	* dwarf2/read.h (struct dwarf2_psymtab): Remove two-parameters
	constructor.  Remove `addr` parameter from other constructor and
	add `per_cu` parameter.
	* dwarf2/read.c (create_partial_symtab): Update.
This commit is contained in:
Simon Marchi 2020-04-07 11:48:46 -04:00
parent 25c11acac3
commit 9f4e76a4b3
3 changed files with 11 additions and 9 deletions

View File

@ -1,3 +1,10 @@
2020-04-07 Simon Marchi <simon.marchi@polymtl.ca>
* dwarf2/read.h (struct dwarf2_psymtab): Remove two-parameters
constructor. Remove `addr` parameter from other constructor and
add `per_cu` parameter.
* dwarf2/read.c (create_partial_symtab): Update.
2020-04-07 Tom de Vries <tdevries@suse.de>
PR symtab/25796

View File

@ -7161,12 +7161,11 @@ create_partial_symtab (struct dwarf2_per_cu_data *per_cu, const char *name)
struct objfile *objfile = per_cu->dwarf2_per_objfile->objfile;
dwarf2_psymtab *pst;
pst = new dwarf2_psymtab (name, objfile, 0);
pst = new dwarf2_psymtab (name, objfile, per_cu);
pst->psymtabs_addrmap_supported = true;
/* This is the glue that links PST into GDB's symbol API. */
pst->per_cu_data = per_cu;
per_cu->v.psymtab = pst;
return pst;

View File

@ -253,14 +253,10 @@ dwarf2_per_objfile *get_dwarf2_per_objfile (struct objfile *objfile);
/* A partial symtab specialized for DWARF. */
struct dwarf2_psymtab : public standard_psymtab
{
dwarf2_psymtab (const char *filename, struct objfile *objfile)
: standard_psymtab (filename, objfile)
{
}
dwarf2_psymtab (const char *filename, struct objfile *objfile,
CORE_ADDR addr)
: standard_psymtab (filename, objfile, addr)
dwarf2_per_cu_data *per_cu)
: standard_psymtab (filename, objfile, 0),
per_cu_data (per_cu)
{
}