From 7e955d83c4128ec773d84b92487ed1cdfed09938 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 15 Jan 2019 17:06:38 -0700 Subject: [PATCH] Change all_objfiles_safe adapter to be a method on program_space 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 * progspace.h (program_space) : New typedef. : 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 | 8 ++++---- gdb/objfiles.h | 22 ---------------------- gdb/progspace.h | 18 ++++++++++++++++++ 5 files changed, 33 insertions(+), 28 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e8178db..f59eeb1 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2019-01-15 Tom Tromey + + * progspace.h (program_space) : New + typedef. + : 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. + 2019-01-17 Tom Tromey * progspace.h (program_space) : New typedef. @@ -1114,7 +1123,7 @@ Update copyright year range in all GDB files. -2019-01-01 Joel Brobecker +2019-01-01, 19 Joel Brobecker * config/djgpp/fnchange.lst: Add entry for gdb/ChangeLog-2018. diff --git a/gdb/jit.c b/gdb/jit.c index b1cf2f5..81c4af4 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->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 02b1a9d..82400a4 100644 --- a/gdb/objfiles.c +++ b/gdb/objfiles.c @@ -514,7 +514,7 @@ objfile_separate_debug_iterate (const struct objfile *parent, /* 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 objfiles_safe to free all objfiles. */ void put_objfile_before (struct objfile *objfile, struct objfile *before_this) { @@ -587,7 +587,7 @@ add_separate_debug_objfile (struct objfile *objfile, struct objfile *parent) parent->separate_debug_objfile = objfile; /* Put the separate debug object before the normal one, this is so that - usage of all_objfiles_safe will stay safe. */ + usage of objfiles_safe will stay safe. */ put_objfile_before (objfile, parent); } @@ -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->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->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 eca46e5..599d8a1 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>> -{ -public: - - explicit all_objfiles_safe (struct program_space *pspace) - : next_adapter>> - (pspace->objfiles_head) - { - } -}; - /* 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 abc5397..472baeb 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 objfiles_range (objfiles_head); } + typedef next_adapter>> + 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->objfiles_safe ()) { ... } + + This variant uses a basic_safe_iterator so that objfiles can be + deleted during iteration. */ + objfiles_safe_range objfiles_safe () + { + return objfiles_safe_range (objfiles_head); + } + /* Pointer to next in linked list. */ struct program_space *next = NULL; -- 2.7.4