[RFA 1/6] Unify new_symbol and new_symbol_full

Tom Tromey
2018-01-06T00:26:29Z

This patch unifies new_symbol with new_symbol_full, replacing a
wrapper function with a default parameter.

2018-01-05 Tom Tromey <tom@tromey.com>

* dwarf2read.c (dwarf2_compute_name): Update comment.
(read_func_scope, read_variable): Update.
(new_symbol): Remove.
(new_symbol_full): Rename to new_symbol.
---
gdb/ChangeLog | 7 +++++++
gdb/dwarf2read.c | 29 +++++++++--------------------
2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 24ccfe6882..5ad43d963a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2018-01-05 Tom Tromey <tom@tromey.com>
+
+ * dwarf2read.c (dwarf2_compute_name): Update comment.
+ (read_func_scope, read_variable): Update.
+ (new_symbol): Remove.
+ (new_symbol_full): Rename to new_symbol.
+
2018-01-05 Pedro Alves <palves@redhat.com>

PR gdb/18653
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index a3028e5c52..92c4903241 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -1862,10 +1862,7 @@ static struct compunit_symtab *dwarf2_start_symtab (struct dwarf2_cu *,
CORE_ADDR);

static struct symbol *new_symbol (struct die_info *, struct type *,
- struct dwarf2_cu *);
-
-static struct symbol *new_symbol_full (struct die_info *, struct type *,
- struct dwarf2_cu *, struct symbol *);
+ struct dwarf2_cu *, struct symbol * = NULL);

static void dwarf2_const_value (const struct attribute *, struct symbol *,
struct dwarf2_cu *);
@@ -10831,7 +10828,7 @@ dwarf2_compute_name (const char *name,
but otherwise compute it by typename_concat inside GDB.
FIXME: Actually this is not really true, or at least not always true.
It's all very confusing. SYMBOL_SET_NAMES doesn't try to demangle
- Fortran names because there is no mangling standard. So new_symbol_full
+ Fortran names because there is no mangling standard. So new_symbol
will set the demangled name to the result of dwarf2_full_name, and it is
the demangled name that GDB uses if it exists. */
if (cu->language == language_ada
@@ -11104,8 +11101,8 @@ dwarf2_physname (const char *name, struct die_info *die, struct dwarf2_cu *cu)

if (cu->language == language_go)
{
- /* This is a lie, but we already lie to the caller new_symbol_full.
- new_symbol_full assumes we return the mangled name.
+ /* This is a lie, but we already lie to the caller new_symbol.
+ new_symbol assumes we return the mangled name.
This just undoes that lie until things are cleaned up. */
}
else
@@ -13731,8 +13728,8 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
}

newobj = push_context (0, lowpc);
- newobj->name = new_symbol_full (die, read_type_die (die, cu), cu,
- (struct symbol *) templ_func);
+ newobj->name = new_symbol (die, read_type_die (die, cu), cu,
+ (struct symbol *) templ_func);

/* If there is a location expression for DW_AT_frame_base, record
it. */
@@ -14287,7 +14284,7 @@ read_variable (struct die_info *die, struct dwarf2_cu *cu)
}
}

- new_symbol_full (die, NULL, cu, storage);
+ new_symbol (die, NULL, cu, storage);
}

/* Call CALLBACK from DW_AT_ranges attribute value OFFSET
@@ -21183,8 +21180,8 @@ var_decode_location (struct attribute *attr, struct symbol *sym,
NULL, allocate a new symbol on the objfile's obstack. */

static struct symbol *
-new_symbol_full (struct die_info *die, struct type *type, struct dwarf2_cu *cu,
- struct symbol *space)
+new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu,
+ struct symbol *space)
{
struct objfile *objfile = cu->objfile;
struct gdbarch *gdbarch = get_objfile_arch (objfile);
@@ -21564,14 +21561,6 @@ new_symbol_full (struct die_info *die, struct type *type, struct dwarf2_cu *cu,
return (sym);
}

-/* A wrapper for new_symbol_full that always allocates a new symbol. */
-
-static struct symbol *
-new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu)
-{
- return new_symbol_full (die, type, cu, NULL);
-}
-
/* Given an attr with a DW_FORM_dataN value in host byte order,
zero-extend it as appropriate for the symbol's type. The DWARF
standard (v4) is not entirely clear about the meaning of using
--
2.13.6