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  <tom@tromey.com>

	* progspace.h (so_list_ptr): Remove typedef.  Don't declare VEC.
	(struct program_space) <added_solibs>: 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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cca51b4247e5104a73f1b606a0473d1a35624a8b..81e528c5e10e63c08a82bd9d7196515a81de36d9 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2018-05-29  Tom Tromey  <tom@tromey.com>
+
+       * progspace.h (so_list_ptr): Remove typedef.  Don't declare VEC.
+       (struct program_space) <added_solibs>: 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  <tom@tromey.com>
 
        * python/py-type.c (typy_richcompare): Update.

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 721afd2c0499f259dae169b0d4039e774cbd75bd..0cc968894b8e99cbbe303e0b56fa72961268a127 100644 (file)
--- 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 ba400d47aa5c4b0ab3f99d363122373a1240137e..9954a190d339c9aa9dc1db9687379b857d770b51 100644 (file)
--- 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 456911b29b1070893bed56b3ee64f1cd408e8274..c2cc87dfcedfe94ae379ee969b92c0ef88ce5fea 100644 (file)
--- 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<struct so_list *> 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 b28ebc628cb1a190b0450af246bb50b78e715485..8f3a12cddb262c5858e21a82c5547aa84bac8b65 100644 (file)
--- 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
            {