[PATCH 2/6] Change all_objfiles_safe adapter to be a method on program_space

[Tom Tromey <tom at tromey dot com>]

This changes the all_objfiles_safe range adapter to be a method on the
program space, and fixes up all the users.

gdb/ChangeLog
2019-01-15  Tom Tromey  <tom@tromey.com>

	* progspace.h (program_space) <all_objfiles_safe_range>: New
	typedef.
	<all_objfiles_safe>: New method.
	* objfiles.h (class all_objfiles_safe): Remove.
	* objfiles.c (free_all_objfiles, objfile_purge_solibs): Update.
	* jit.c (jit_inferior_exit_hook): Update.
---
 gdb/ChangeLog   | 11 ++++++++++-
 gdb/jit.c       |  2 +-
 gdb/objfiles.c  |  4 ++--
 gdb/objfiles.h  | 22 ----------------------
 gdb/progspace.h | 18 ++++++++++++++++++
 5 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/gdb/jit.c b/gdb/jit.c
index 543eb60995..645b3ff97e 100644
--- a/gdb/jit.c
+++ b/gdb/jit.c
@@ -1391,7 +1391,7 @@ jit_breakpoint_re_set (void)
 static void
 jit_inferior_exit_hook (struct inferior *inf)
 {
-  for (objfile *objf : all_objfiles_safe (current_program_space))
+  for (objfile *objf : current_program_space->all_objfiles_safe ())
     {
       struct jit_objfile_data *objf_data
 	= (struct jit_objfile_data *) objfile_data (objf, jit_objfile_data);
diff --git a/gdb/objfiles.c b/gdb/objfiles.c
index 569e308b6b..e9432ca145 100644
--- a/gdb/objfiles.c
+++ b/gdb/objfiles.c
@@ -735,7 +735,7 @@ free_all_objfiles (void)
   for (so = master_so_list (); so; so = so->next)
     gdb_assert (so->objfile == NULL);
 
-  for (objfile *objfile : all_objfiles_safe (current_program_space))
+  for (objfile *objfile : current_program_space->all_objfiles_safe ())
     delete objfile;
   clear_symtab_users (0);
 }
@@ -1044,7 +1044,7 @@ have_full_symbols (void)
 void
 objfile_purge_solibs (void)
 {
-  for (objfile *objf : all_objfiles_safe (current_program_space))
+  for (objfile *objf : current_program_space->all_objfiles_safe ())
     {
       /* We assume that the solib package has been purged already, or will
 	 be soon.  */
diff --git a/gdb/objfiles.h b/gdb/objfiles.h
index 9ab0f38280..244c1280be 100644
--- a/gdb/objfiles.h
+++ b/gdb/objfiles.h
@@ -553,28 +553,6 @@ extern void default_iterate_over_objfiles_in_search_order
    void *cb_data, struct objfile *current_objfile);
 
 
-/* An iterarable object that can be used to iterate over all
-   objfiles.  The basic use is in a foreach, like:
-
-   for (objfile *objf : all_objfiles_safe (pspace)) { ... }
-
-   This variant uses a basic_safe_iterator so that objfiles can be
-   deleted during iteration.  */
-
-class all_objfiles_safe
-  : public next_adapter<struct objfile,
-			basic_safe_iterator<next_iterator<objfile>>>
-{
-public:
-
-  explicit all_objfiles_safe (struct program_space *pspace)
-    : next_adapter<struct objfile,
-		   basic_safe_iterator<next_iterator<objfile>>>
-        (pspace->objfiles)
-  {
-  }
-};
-
 /* A range adapter that makes it possible to iterate over all
    compunits in one objfile.  */
 
diff --git a/gdb/progspace.h b/gdb/progspace.h
index 5006840d85..dd97a4e2be 100644
--- a/gdb/progspace.h
+++ b/gdb/progspace.h
@@ -26,6 +26,8 @@
 #include "gdb_bfd.h"
 #include "gdb_vecs.h"
 #include "registry.h"
+#include "common/next-iterator.h"
+#include "common/safe-iterator.h"
 
 struct target_ops;
 struct bfd;
@@ -148,6 +150,22 @@ struct program_space
     return all_objfiles_range (objfiles);
   }
 
+  typedef next_adapter<struct objfile,
+		       basic_safe_iterator<next_iterator<objfile>>>
+    all_objfiles_safe_range;
+
+  /* An iterable object that can be used to iterate over all objfiles.
+     The basic use is in a foreach, like:
+
+     for (objfile *objf : pspace->all_objfiles_safe ()) { ... }
+
+     This variant uses a basic_safe_iterator so that objfiles can be
+     deleted during iteration.  */
+  all_objfiles_safe_range all_objfiles_safe ()
+  {
+    return all_objfiles_safe_range (objfiles);
+  }
+
   /* Pointer to next in linked list.  */
   struct program_space *next = NULL;
 
-- 
2.17.2