From ebe824f5dcf96c8f70e07affb44c3a1679849e28 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 23 Sep 2020 09:32:54 -0600 Subject: [PATCH] Remove some manual memory management from compile interface This changes gdb's compile code to use std::vector in a couple of places, rather than manual memory management. gdb/ChangeLog 2020-09-23 Tom Tromey * compile/compile-cplus-types.c (compile_cplus_convert_struct_or_union): Use std::vector. (compile_cplus_convert_func): Likewise. * compile/compile-c-types.c (convert_func): Use std::vector. --- gdb/ChangeLog | 7 ++++++ gdb/compile/compile-c-types.c | 4 ++-- gdb/compile/compile-cplus-types.c | 39 ++++++++++++++----------------- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ce9cef5f516..84d2700ebe2 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2020-09-23 Tom Tromey + + * compile/compile-cplus-types.c + (compile_cplus_convert_struct_or_union): Use std::vector. + (compile_cplus_convert_func): Likewise. + * compile/compile-c-types.c (convert_func): Use std::vector. + 2020-09-21 Tom Tromey * sparc-tdep.c (sparc32_skip_prologue): Use diff --git a/gdb/compile/compile-c-types.c b/gdb/compile/compile-c-types.c index 585f6c89435..82c9af37b5f 100644 --- a/gdb/compile/compile-c-types.c +++ b/gdb/compile/compile-c-types.c @@ -176,13 +176,13 @@ convert_func (compile_c_instance *context, struct type *type) return_type = context->convert_type (target_type); array.n_elements = type->num_fields (); - array.elements = XNEWVEC (gcc_type, type->num_fields ()); + std::vector elements (array.n_elements); + array.elements = elements.data (); for (i = 0; i < type->num_fields (); ++i) array.elements[i] = context->convert_type (type->field (i).type ()); result = context->plugin ().build_function_type (return_type, &array, is_varargs); - xfree (array.elements); return result; } diff --git a/gdb/compile/compile-cplus-types.c b/gdb/compile/compile-cplus-types.c index a0945683e47..f92091a8252 100644 --- a/gdb/compile/compile-cplus-types.c +++ b/gdb/compile/compile-cplus-types.c @@ -848,33 +848,29 @@ compile_cplus_convert_struct_or_union (compile_cplus_instance *instance, gcc_type result; if (type->code () == TYPE_CODE_STRUCT) { - struct gcc_vbase_array bases; int num_baseclasses = TYPE_N_BASECLASSES (type); + std::vector elements (num_baseclasses); + std::vector flags (num_baseclasses); - memset (&bases, 0, sizeof (bases)); + struct gcc_vbase_array bases {}; + bases.elements = elements.data (); + bases.flags = flags.data (); + bases.n_elements = num_baseclasses; - if (num_baseclasses > 0) + for (int i = 0; i < num_baseclasses; ++i) { - bases.elements = XNEWVEC (gcc_type, num_baseclasses); - bases.flags = XNEWVEC (enum gcc_cp_symbol_kind, num_baseclasses); - bases.n_elements = num_baseclasses; - for (int i = 0; i < num_baseclasses; ++i) - { - struct type *base_type = TYPE_BASECLASS (type, i); - - bases.flags[i] = GCC_CP_SYMBOL_BASECLASS - | get_field_access_flag (type, i) - | (BASETYPE_VIA_VIRTUAL (type, i) - ? GCC_CP_FLAG_BASECLASS_VIRTUAL - : GCC_CP_FLAG_BASECLASS_NOFLAG); - bases.elements[i] = instance->convert_type (base_type); - } + struct type *base_type = TYPE_BASECLASS (type, i); + + bases.flags[i] = (GCC_CP_SYMBOL_BASECLASS + | get_field_access_flag (type, i) + | (BASETYPE_VIA_VIRTUAL (type, i) + ? GCC_CP_FLAG_BASECLASS_VIRTUAL + : GCC_CP_FLAG_BASECLASS_NOFLAG)); + bases.elements[i] = instance->convert_type (base_type); } result = instance->plugin ().start_class_type (name.get (), resuld, &bases, filename, line); - xfree (bases.flags); - xfree (bases.elements); } else { @@ -985,8 +981,8 @@ compile_cplus_convert_func (compile_cplus_instance *instance, types. Those are impossible in C, though. */ gcc_type return_type = instance->convert_type (target_type); - struct gcc_type_array array = - { type->num_fields (), XNEWVEC (gcc_type, type->num_fields ()) }; + std::vector elements (type->num_fields ()); + struct gcc_type_array array = { type->num_fields (), elements.data () }; int artificials = 0; for (int i = 0; i < type->num_fields (); ++i) { @@ -1006,7 +1002,6 @@ compile_cplus_convert_func (compile_cplus_instance *instance, with some minsyms like printf (compile-cplus.exp has examples). */ gcc_type result = instance->plugin ().build_function_type (return_type, &array, is_varargs); - xfree (array.elements); return result; } -- 2.30.2