From 2f4732b0e622d9d5d899c29e2132e4cd2966aaad Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 3 Nov 2017 14:55:39 -0600 Subject: [PATCH] Remove symbolp vector This removes the symbolp typedef from dwarf2read.c and converts the associated VEC uses to std::vector. This fixes a latent possible memory leak if an exception were thrown, because there were no cleanups installed for these VECs. Regression tested on the buildbot. gdb/ChangeLog 2017-11-08 Tom Tromey * dwarf2read.c (symbolp): Remove typedef. (read_func_scope): Use std::vector. (process_structure_scope): Use std::vector. --- gdb/ChangeLog | 6 ++++++ gdb/dwarf2read.c | 26 ++++++++++---------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a26afa42173..cf9ccfc58f8 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2017-11-08 Tom Tromey + + * dwarf2read.c (symbolp): Remove typedef. + (read_func_scope): Use std::vector. + (process_structure_scope): Use std::vector. + 2017-11-08 Pedro Alves * ada-lang.c (ada_make_symbol_completion_list): Use diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 389d8f70b2b..b6bd2917e35 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -83,9 +83,6 @@ #include #include "selftest.h" -typedef struct symbol *symbolp; -DEF_VEC_P (symbolp); - /* When == 1, print basic high level tracing messages. When > 1, be more verbose. This is in contrast to the low level DIE reading of dwarf_die_debug. */ @@ -12204,7 +12201,7 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu) CORE_ADDR baseaddr; struct block *block; int inlined_func = (die->tag == DW_TAG_inlined_subroutine); - VEC (symbolp) *template_args = NULL; + std::vector template_args; struct template_symbol *templ_func = NULL; if (inlined_func) @@ -12297,7 +12294,7 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu) struct symbol *arg = new_symbol (child_die, NULL, cu); if (arg != NULL) - VEC_safe_push (symbolp, template_args, arg); + template_args.push_back (arg); } else process_die (child_die, cu); @@ -12352,18 +12349,17 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu) gdbarch_make_symbol_special (gdbarch, newobj->name, objfile); /* Attach template arguments to function. */ - if (! VEC_empty (symbolp, template_args)) + if (!template_args.empty ()) { gdb_assert (templ_func != NULL); - templ_func->n_template_arguments = VEC_length (symbolp, template_args); + templ_func->n_template_arguments = template_args.size (); templ_func->template_arguments = XOBNEWVEC (&objfile->objfile_obstack, struct symbol *, templ_func->n_template_arguments); memcpy (templ_func->template_arguments, - VEC_address (symbolp, template_args), + template_args.data (), (templ_func->n_template_arguments * sizeof (struct symbol *))); - VEC_free (symbolp, template_args); } /* In C++, we can have functions nested inside functions (e.g., when @@ -14314,7 +14310,7 @@ process_structure_scope (struct die_info *die, struct dwarf2_cu *cu) if (die->child != NULL && ! die_is_declaration (die, cu)) { struct field_info fi; - VEC (symbolp) *template_args = NULL; + std::vector template_args; struct cleanup *back_to = make_cleanup (null_cleanup, 0); memset (&fi, 0, sizeof (struct field_info)); @@ -14359,27 +14355,25 @@ process_structure_scope (struct die_info *die, struct dwarf2_cu *cu) struct symbol *arg = new_symbol (child_die, NULL, cu); if (arg != NULL) - VEC_safe_push (symbolp, template_args, arg); + template_args.push_back (arg); } child_die = sibling_die (child_die); } /* Attach template arguments to type. */ - if (! VEC_empty (symbolp, template_args)) + if (!template_args.empty ()) { ALLOCATE_CPLUS_STRUCT_TYPE (type); - TYPE_N_TEMPLATE_ARGUMENTS (type) - = VEC_length (symbolp, template_args); + TYPE_N_TEMPLATE_ARGUMENTS (type) = template_args.size (); TYPE_TEMPLATE_ARGUMENTS (type) = XOBNEWVEC (&objfile->objfile_obstack, struct symbol *, TYPE_N_TEMPLATE_ARGUMENTS (type)); memcpy (TYPE_TEMPLATE_ARGUMENTS (type), - VEC_address (symbolp, template_args), + template_args.data (), (TYPE_N_TEMPLATE_ARGUMENTS (type) * sizeof (struct symbol *))); - VEC_free (symbolp, template_args); } /* Attach fields and member functions to the type. */ -- 2.30.2