From patchwork Mon Dec 16 03:39:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 36894 Received: (qmail 25781 invoked by alias); 16 Dec 2019 03:39:27 -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 25624 invoked by uid 89); 16 Dec 2019 03:39:24 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-18.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_SOFTFAIL autolearn=ham version=3.3.1 spammy=allocating, converts, sometime 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; Mon, 16 Dec 2019 03:39:23 +0000 Received: from smtp.ebox.ca (smtp.ebox.ca [96.127.255.82]) by barracuda.ebox.ca with ESMTP id D5fYvk3ID2JnpcF2 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 15 Dec 2019 22:39:21 -0500 (EST) Received: from simark.lan (unknown [192.222.164.54]) by smtp.ebox.ca (Postfix) with ESMTP id 726FB441B21; Sun, 15 Dec 2019 22:39:21 -0500 (EST) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH v2 3/5] jit: make gdb_object::symtabs an std::forward_list Date: Sun, 15 Dec 2019 22:39:15 -0500 Message-Id: <20191216033917.2936248-4-simon.marchi@polymtl.ca> In-Reply-To: <20191216033917.2936248-1-simon.marchi@polymtl.ca> References: <20191216033917.2936248-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 X-IsSubscribed: yes Replace the manual linked list with an std::forward_list, simplifying the memory management. This requires allocating gdb_object with new and free'ing it with delete. gdb/ChangeLog: * jit.c: Include forward_list. (struct gdb_symtab) : Remove field. (struct gdb_object) : Change type to std::forward_list. (jit_object_open_impl): Allocate gdb_object with new. (jit_symtab_open_impl): Adjust to std::forward_list. (finalize_symtab): Don't delete symtab. (jit_object_close_impl): Adjust to std::forward_list. Free gdb_object with delete. --- gdb/jit.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/gdb/jit.c b/gdb/jit.c index 07767275f533..a731edd870d3 100644 --- a/gdb/jit.c +++ b/gdb/jit.c @@ -41,6 +41,7 @@ #include "gdb_bfd.h" #include "readline/tilde.h" #include "completer.h" +#include static std::string jit_reader_dir; @@ -481,15 +482,19 @@ struct gdb_symtab /* The source file for this symtab. */ std::string file_name; - - struct gdb_symtab *next = nullptr; }; /* Proxy object for building an object. */ struct gdb_object { - struct gdb_symtab *symtabs; + /* Symtabs of this object. + + This is specifically a linked list, instead of, for example, a vector, + because the pointers are returned to the user's debug info reader. So + it's important that the objects don't change location during their + lifetime (which would happen with a vector of objects getting resized). */ + std::forward_list symtabs; }; /* The type of the `private' data passed around by the callback @@ -521,7 +526,7 @@ jit_object_open_impl (struct gdb_symbol_callbacks *cb) /* CB is not required right now, but sometime in the future we might need a handle to it, and we'd like to do that without breaking the ABI. */ - return XCNEW (struct gdb_object); + return new gdb_object; } /* Readers call into this function to open a new gdb_symtab, which, @@ -534,10 +539,8 @@ jit_symtab_open_impl (struct gdb_symbol_callbacks *cb, { /* CB stays unused. See comment in jit_object_open_impl. */ - gdb_symtab *ret = new gdb_symtab (file_name); - ret->next = object->symtabs; - object->symtabs = ret; - return ret; + object->symtabs.emplace_front (file_name); + return &object->symtabs.front (); } /* Returns true if the block corresponding to old should be placed @@ -774,8 +777,6 @@ finalize_symtab (struct gdb_symtab *stab, struct objfile *objfile) BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK); } } - - delete stab; } /* Called when closing a gdb_objfile. Converts OBJ to a proper @@ -785,7 +786,6 @@ static void jit_object_close_impl (struct gdb_symbol_callbacks *cb, struct gdb_object *obj) { - struct gdb_symtab *i, *j; struct objfile *objfile; jit_dbg_reader_data *priv_data; @@ -795,14 +795,12 @@ jit_object_close_impl (struct gdb_symbol_callbacks *cb, OBJF_NOT_FILENAME); objfile->per_bfd->gdbarch = target_gdbarch (); - j = NULL; - for (i = obj->symtabs; i; i = j) - { - j = i->next; - finalize_symtab (i, objfile); - } + for (gdb_symtab &symtab : obj->symtabs) + finalize_symtab (&symtab, objfile); + add_objfile_entry (objfile, *priv_data); - xfree (obj); + + delete obj; } /* Try to read CODE_ENTRY using the loaded jit reader (if any).