From patchwork Fri Dec 13 06:03:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 36832 Received: (qmail 86422 invoked by alias); 13 Dec 2019 06:03:36 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 86292 invoked by uid 89); 13 Dec 2019 06:03:36 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-18.2 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_SOFTFAIL autolearn=ham version=3.3.1 spammy=HContent-Transfer-Encoding:8bit X-HELO: barracuda.ebox.ca Received: from barracuda.ebox.ca (HELO barracuda.ebox.ca) (96.127.255.19) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 13 Dec 2019 06:03:34 +0000 Received: from smtp.ebox.ca (smtp.ebox.ca [96.127.255.82]) by barracuda.ebox.ca with ESMTP id iTuyB2zx7yHq4fxV (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 13 Dec 2019 01:03:32 -0500 (EST) Received: from simark.lan (unknown [192.222.164.54]) by smtp.ebox.ca (Postfix) with ESMTP id 9BC46441B21; Fri, 13 Dec 2019 01:03:32 -0500 (EST) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 7/7] jit: make gdb_symtab::blocks a vector of unique_ptr Date: Fri, 13 Dec 2019 01:03:23 -0500 Message-Id: <20191213060323.1799590-8-simon.marchi@polymtl.ca> In-Reply-To: <20191213060323.1799590-1-simon.marchi@polymtl.ca> References: <20191213060323.1799590-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 X-IsSubscribed: yes This avoids the need for a destructor at all. gdb/ChangeLog: * jit.c (struct gdb_symtab) <~gdb_symtab>: Remove. : Change type to std::vector>. (jit_block_open_impl): Adjust. (finalize_symtab): Adjust. --- gdb/jit.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/gdb/jit.c b/gdb/jit.c index 56a51f04eb2f..f08ad799a7ea 100644 --- a/gdb/jit.c +++ b/gdb/jit.c @@ -460,15 +460,9 @@ struct gdb_symtab : file_name (file_name != nullptr ? file_name : "") {} - ~gdb_symtab () - { - for (gdb_block *gdb_block_iter : this->blocks) - delete gdb_block_iter; - } - /* The list of blocks in this symtab. These will eventually be converted to real blocks. */ - std::vector blocks; + std::vector> blocks; /* A mapping between line numbers to PC. */ gdb::unique_xmalloc_ptr linetable; @@ -541,8 +535,8 @@ jit_block_open_impl (struct gdb_symbol_callbacks *cb, { /* Place the block at the end of the vector, it will be sorted when the symtab is finalized. */ - symtab->blocks.push_back (new gdb_block (parent, begin, end, name)); - return symtab->blocks.back (); + symtab->blocks.emplace_back (new gdb_block (parent, begin, end, name)); + return symtab->blocks.back ().get (); } /* Readers call this to add a line mapping (from PC to line number) to @@ -596,7 +590,8 @@ finalize_symtab (struct gdb_symtab *stab, struct objfile *objfile) /* Sort the blocks in the order they should appear in the blockvector. */ std::sort (stab->blocks.begin (), stab->blocks.end (), - [] (const gdb_block *a, const gdb_block *b) + [] (const std::unique_ptr &a, + const std::unique_ptr &b) { if (a->begin != b->begin) return a->begin < b->begin; @@ -640,7 +635,7 @@ finalize_symtab (struct gdb_symtab *stab, struct objfile *objfile) object for each. Simultaneously, keep setting the real_block fields. */ int block_idx = FIRST_LOCAL_BLOCK; - for (gdb_block *gdb_block_iter : stab->blocks) + for (const std::unique_ptr &gdb_block_iter : stab->blocks) { struct block *new_block = allocate_block (&objfile->objfile_obstack); struct symbol *block_name = allocate_symbol (objfile); @@ -703,7 +698,7 @@ finalize_symtab (struct gdb_symtab *stab, struct objfile *objfile) /* Fill up the superblock fields for the real blocks, using the real_block fields populated earlier. */ - for (gdb_block *gdb_block_iter : stab->blocks) + for (const std::unique_ptr &gdb_block_iter : stab->blocks) { if (gdb_block_iter->parent != NULL) {