From bcb430e4cd5bcd913813236536031f1fc7f72aee Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 29 May 2018 00:38:23 -0600 Subject: [PATCH] Change program_space::added_solibs to a std::vector This changes program_space::added_solibs to a std::vector, removing a VEC. Tested by the buildbot. gdb/ChangeLog 2018-05-29 Tom Tromey * progspace.h (so_list_ptr): Remove typedef. Don't declare VEC. (struct program_space) : Now a std::vector. * breakpoint.c (print_solib_event): Update. (check_status_catch_solib): Update. * progspace.c (clear_program_space_solib_cache): Update. * solib.c (update_solib_list): Update. --- gdb/ChangeLog | 9 +++++++++ gdb/breakpoint.c | 22 ++++++---------------- gdb/progspace.c | 3 +-- gdb/progspace.h | 5 +---- gdb/solib.c | 2 +- 5 files changed, 18 insertions(+), 23 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index cca51b4..81e528c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,14 @@ 2018-05-29 Tom Tromey + * progspace.h (so_list_ptr): Remove typedef. Don't declare VEC. + (struct program_space) : Now a std::vector. + * breakpoint.c (print_solib_event): Update. + (check_status_catch_solib): Update. + * progspace.c (clear_program_space_solib_cache): Update. + * solib.c (update_solib_list): Update. + +2018-05-29 Tom Tromey + * python/py-type.c (typy_richcompare): Update. * guile/scm-type.c (tyscm_equal_p_type_smob): Update. * gdbtypes.h (types_deeply_equal): Return bool. diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 721afd2..0cc9688 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -4580,8 +4580,7 @@ static void print_solib_event (int is_catchpoint) { bool any_deleted = !current_program_space->deleted_solibs.empty (); - int any_added - = !VEC_empty (so_list_ptr, current_program_space->added_solibs); + bool any_added = !current_program_space->added_solibs.empty (); if (!is_catchpoint) { @@ -4613,18 +4612,14 @@ print_solib_event (int is_catchpoint) if (any_added) { - struct so_list *iter; - int ix; - current_uiout->text (_(" Inferior loaded ")); ui_out_emit_list list_emitter (current_uiout, "added"); - for (ix = 0; - VEC_iterate (so_list_ptr, current_program_space->added_solibs, - ix, iter); - ++ix) + bool first = true; + for (struct so_list *iter : current_program_space->added_solibs) { - if (ix > 0) + if (!first) current_uiout->text (" "); + first = false; current_uiout->field_string ("library", iter->so_name); current_uiout->text ("\n"); } @@ -8009,12 +8004,7 @@ check_status_catch_solib (struct bpstats *bs) if (self->is_load) { - struct so_list *iter; - - for (int ix = 0; - VEC_iterate (so_list_ptr, current_program_space->added_solibs, - ix, iter); - ++ix) + for (struct so_list *iter : current_program_space->added_solibs) { if (!self->regex || self->compiled->exec (iter->so_name, 0, NULL, 0) == 0) diff --git a/gdb/progspace.c b/gdb/progspace.c index ba400d4..9954a19 100644 --- a/gdb/progspace.c +++ b/gdb/progspace.c @@ -400,8 +400,7 @@ update_address_spaces (void) void clear_program_space_solib_cache (struct program_space *pspace) { - VEC_free (so_list_ptr, pspace->added_solibs); - + pspace->added_solibs.clear (); pspace->deleted_solibs.clear (); } diff --git a/gdb/progspace.h b/gdb/progspace.h index 456911b..c2cc87d 100644 --- a/gdb/progspace.h +++ b/gdb/progspace.h @@ -36,9 +36,6 @@ struct address_space; struct program_space_data; struct address_space_data; -typedef struct so_list *so_list_ptr; -DEF_VEC_P (so_list_ptr); - /* A program space represents a symbolic view of an address space. Roughly speaking, it holds all the data associated with a non-running-yet program (main executable, main symbols), and when @@ -207,7 +204,7 @@ struct program_space /* When an solib is added, it is also added to this vector. This is so we can properly report solib changes to the user. */ - VEC (so_list_ptr) *added_solibs = NULL; + std::vector added_solibs; /* When an solib is removed, its name is added to this vector. This is so we can properly report solib changes to the user. */ diff --git a/gdb/solib.c b/gdb/solib.c index b28ebc6..8f3a12c 100644 --- a/gdb/solib.c +++ b/gdb/solib.c @@ -862,7 +862,7 @@ update_solib_list (int from_tty) { i->pspace = current_program_space; - VEC_safe_push (so_list_ptr, current_program_space->added_solibs, i); + current_program_space->added_solibs.push_back (i); TRY { -- 2.7.4