+2019-01-09 Tom Tromey <tom@tromey.com>
+
+ * common/next-iterator.h (next_adapter): Add Iterator template
+ parameter.
+ * objfiles.h (ALL_OBJFILES_SAFE): Remove.
+ (class all_objfiles_safe): New.
+ * jit.c (jit_inferior_exit_hook): Use all_objfiles_safe.
+ * objfiles.c (put_objfile_before): Update comment.
+ (add_separate_debug_objfile): Likewise.
+ (free_all_objfiles): Use all_objfiles_safe.
+ (objfile_purge_solibs): Likewise.
+
2019-01-09 Tom Tromey <tom@tromey.com>
* symtab.c (iterate_over_symtabs, matching_obj_sections)
/* A range adapter that allows iterating over a linked list. */
-template<typename T>
+template<typename T, typename Iterator = next_iterator<T>>
class next_adapter
{
public:
{
}
- using iterator = next_iterator<T>;
+ using iterator = Iterator;
iterator begin () const
{
static void
jit_inferior_exit_hook (struct inferior *inf)
{
- struct objfile *objf;
- struct objfile *temp;
-
- ALL_OBJFILES_SAFE (objf, temp)
+ for (objfile *objf : all_objfiles_safe (current_program_space))
{
struct jit_objfile_data *objf_data
= (struct jit_objfile_data *) objfile_data (objf, jit_objfile_data);
/* Put one object file before a specified on in the global list.
This can be used to make sure an object file is destroyed before
- another when using ALL_OBJFILES_SAFE to free all objfiles. */
+ another when using all_objfiles_safe to free all objfiles. */
void
put_objfile_before (struct objfile *objfile, struct objfile *before_this)
{
parent->separate_debug_objfile = objfile;
/* Put the separate debug object before the normal one, this is so that
- usage of the ALL_OBJFILES_SAFE macro will stay safe. */
+ usage of all_objfiles_safe will stay safe. */
put_objfile_before (objfile, parent);
}
void
free_all_objfiles (void)
{
- struct objfile *objfile, *temp;
struct so_list *so;
/* Any objfile referencewould become stale. */
for (so = master_so_list (); so; so = so->next)
gdb_assert (so->objfile == NULL);
- ALL_OBJFILES_SAFE (objfile, temp)
- {
+ for (objfile *objfile : all_objfiles_safe (current_program_space))
delete objfile;
- }
clear_symtab_users (0);
}
\f
void
objfile_purge_solibs (void)
{
- struct objfile *objf;
- struct objfile *temp;
-
- ALL_OBJFILES_SAFE (objf, temp)
- {
- /* We assume that the solib package has been purged already, or will
- be soon. */
+ for (objfile *objf : all_objfiles_safe (current_program_space))
+ {
+ /* We assume that the solib package has been purged already, or will
+ be soon. */
- if (!(objf->flags & OBJF_USERLOADED) && (objf->flags & OBJF_SHARED))
- delete objf;
- }
+ if (!(objf->flags & OBJF_USERLOADED) && (objf->flags & OBJF_SHARED))
+ delete objf;
+ }
}
#include "gdb_bfd.h"
#include <vector>
#include "common/next-iterator.h"
+#include "common/safe-iterator.h"
struct bcache;
struct htab;
}
};
+/* An iterarable object that can be used to iterate over all
+ objfiles. The basic use is in a foreach, like:
-/* Traverse all object files in the current program space.
- ALL_OBJFILES_SAFE works even if you delete the objfile during the
- traversal. */
+ 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)
+ {
+ }
+};
+
+
+/* Traverse all object files in the current program space. */
#define ALL_OBJFILES(obj) \
for ((obj) = current_program_space->objfiles; \
(obj) != NULL; \
(obj) = (obj)->next)
-#define ALL_OBJFILES_SAFE(obj,nxt) \
- for ((obj) = current_program_space->objfiles; \
- (obj) != NULL? ((nxt)=(obj)->next,1) :0; \
- (obj) = (nxt))
-
/* Traverse all symtabs in one objfile. */
#define ALL_OBJFILE_FILETABS(objfile, cu, s) \