From 9f4e76a4b3f61d8182a4a7afe0e479ea7e3093a3 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Tue, 7 Apr 2020 11:48:46 -0400 Subject: [PATCH] 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. --- gdb/ChangeLog | 7 +++++++ gdb/dwarf2/read.c | 3 +-- gdb/dwarf2/read.h | 10 +++------- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e24011dbb0..af53206af4 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2020-04-07 Simon Marchi + + * 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 PR symtab/25796 diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 61e288ab83..1e593b3906 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 039113f87e..bd743acc71 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) { } -- 2.39.5