gdb: small cleanups in dwarf2_psymtab constructors

Message ID 20200407041914.1638066-1-simon.marchi@polymtl.ca
State New
Headers show
Series
  • gdb: small cleanups in dwarf2_psymtab constructors
Related show

Commit Message

Keith Seitz via Gdb-patches April 7, 2020, 4:19 a.m.
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.
---
 gdb/dwarf2/read.c |  3 +--
 gdb/dwarf2/read.h | 10 +++-------
 2 files changed, 4 insertions(+), 9 deletions(-)

-- 
2.26.0

Comments

Tom Tromey April 7, 2020, 3:47 p.m. | #1
>>>>> "Simon" == Simon Marchi via Gdb-patches <gdb-patches@sourceware.org> writes:


Simon> 	* dwarf2/read.h (struct dwarf2_psymtab): Remove two-parameters
Simon> 	constructor.  Remove `addr` parameter from other constructor and
Simon> 	add `per_cu` parameter.
Simon> 	* dwarf2/read.c (create_partial_symtab): Update.

Looks good to me.  Thank you.

Tom
Keith Seitz via Gdb-patches April 7, 2020, 3:49 p.m. | #2
On 2020-04-07 11:47 a.m., Tom Tromey wrote:
>>>>>> "Simon" == Simon Marchi via Gdb-patches <gdb-patches@sourceware.org> writes:

> 

> Simon> 	* dwarf2/read.h (struct dwarf2_psymtab): Remove two-parameters

> Simon> 	constructor.  Remove `addr` parameter from other constructor and

> Simon> 	add `per_cu` parameter.

> Simon> 	* dwarf2/read.c (create_partial_symtab): Update.

> 

> Looks good to me.  Thank you.

> 

> Tom

> 


Thanks, I pushed it.

Simon

Patch

diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index 749acb3ba26c..f0d809a68bc6 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -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;
diff --git a/gdb/dwarf2/read.h b/gdb/dwarf2/read.h
index 039113f87e99..bd743acc7150 100644
--- a/gdb/dwarf2/read.h
+++ b/gdb/dwarf2/read.h
@@ -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)
   {
   }