From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 92455 invoked by alias); 25 Nov 2018 16:54:47 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 92346 invoked by uid 89); 25 Nov 2018 16:54:47 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.3 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=adapter, sk:current, nxt, iterating X-HELO: gateway34.websitewelcome.com Received: from gateway34.websitewelcome.com (HELO gateway34.websitewelcome.com) (192.185.148.164) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 25 Nov 2018 16:54:45 +0000 Received: from cm10.websitewelcome.com (cm10.websitewelcome.com [100.42.49.4]) by gateway34.websitewelcome.com (Postfix) with ESMTP id E0ED335113F for ; Sun, 25 Nov 2018 10:54:43 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id QxgBgQZcJBcCXQxgBgWUnv; Sun, 25 Nov 2018 10:54:43 -0600 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=gQ7Dlv98G9j2kpPD9N4ZUpCEY93FJlIckNus73sAG+o=; b=jp3rU+g7SfsMSJoC42DdAu0tgt R6P/g+9TNkApJY+LBTInI94ugO8ETZg9TYHmCf24XWwIU4uheFf+chMrS/Jm0XlWD9SE1rt4NC11k n7FVCbJxFEhMWMIiZQDmmfb3A; Received: from 97-122-190-66.hlrn.qwest.net ([97.122.190.66]:51592 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1gQxgB-0013GF-Kw; Sun, 25 Nov 2018 10:54:43 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 04/12] Remove ALL_OBJFILES_SAFE Date: Sun, 25 Nov 2018 16:54:00 -0000 Message-Id: <20181125165439.13773-5-tom@tromey.com> In-Reply-To: <20181125165439.13773-1-tom@tromey.com> References: <20181125165439.13773-1-tom@tromey.com> X-SW-Source: 2018-11/txt/msg00406.txt.bz2 This removes the ALL_OBJFILES_SAFE macro, replacing the uses with ranged for loops. gdb/ChangeLog 2018-11-25 Tom Tromey * 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. --- gdb/ChangeLog | 12 ++++++++++++ gdb/common/next-iterator.h | 4 ++-- gdb/jit.c | 5 +---- gdb/objfiles.c | 26 ++++++++++---------------- gdb/objfiles.h | 32 ++++++++++++++++++++++++-------- 5 files changed, 49 insertions(+), 30 deletions(-) diff --git a/gdb/common/next-iterator.h b/gdb/common/next-iterator.h index 79241a82a4..27c6092f2c 100644 --- a/gdb/common/next-iterator.h +++ b/gdb/common/next-iterator.h @@ -72,7 +72,7 @@ private: /* A range adapter that allows iterating over a linked list. */ -template +template> class next_adapter { public: @@ -82,7 +82,7 @@ public: { } - using iterator = next_iterator; + using iterator = Iterator; iterator begin () const { diff --git a/gdb/jit.c b/gdb/jit.c index 2f5f6f8ade..a217c3ca75 100644 --- a/gdb/jit.c +++ b/gdb/jit.c @@ -1393,10 +1393,7 @@ jit_breakpoint_re_set (void) static void jit_inferior_exit_hook (struct inferior *inf) { - struct objfile *objf; - struct objfile *temp; - - ALL_OBJFILES_SAFE (objf, temp) + for (struct objfile *objf : all_objfiles_safe (current_program_space)) { 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 90d2502dde..19047694af 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 all_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 the ALL_OBJFILES_SAFE macro will stay safe. */ + usage of all_objfiles_safe will stay safe. */ put_objfile_before (objfile, parent); } @@ -730,17 +730,14 @@ objfile::~objfile () 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 (struct objfile *objfile : all_objfiles_safe (current_program_space)) delete objfile; - } clear_symtab_users (0); } @@ -1047,17 +1044,14 @@ have_full_symbols (void) 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 (struct 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; + } } diff --git a/gdb/objfiles.h b/gdb/objfiles.h index dee64c816a..1d310e5584 100644 --- a/gdb/objfiles.h +++ b/gdb/objfiles.h @@ -29,6 +29,7 @@ #include "gdb_bfd.h" #include #include "common/next-iterator.h" +#include "common/safe-iterator.h" struct bcache; struct htab; @@ -581,21 +582,36 @@ public: } }; +/* 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 (struct 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) + { + } +}; + + +/* 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) \ -- 2.17.2