Patchwork [7/7] jit: make gdb_symtab::blocks a vector of unique_ptr

login
register
mail settings
Submitter Simon Marchi
Date Dec. 13, 2019, 6:03 a.m.
Message ID <20191213060323.1799590-8-simon.marchi@polymtl.ca>
Download mbox | patch
Permalink /patch/36832/
State New
Headers show

Comments

Simon Marchi - Dec. 13, 2019, 6:03 a.m.
This avoids the need for a destructor at all.

gdb/ChangeLog:

	* jit.c (struct gdb_symtab) <~gdb_symtab>: Remove.
	<blocks>: Change type to
	std::vector<std::unique_ptr<gdb_block>>.
	(jit_block_open_impl): Adjust.
	(finalize_symtab): Adjust.
---
 gdb/jit.c | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

Patch

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<gdb_block *> blocks;
+  std::vector<std::unique_ptr<gdb_block>> blocks;
 
   /* A mapping between line numbers to PC.  */
   gdb::unique_xmalloc_ptr<struct linetable> 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<gdb_block> &a,
+		 const std::unique_ptr<gdb_block> &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> &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> &gdb_block_iter : stab->blocks)
     {
       if (gdb_block_iter->parent != NULL)
 	{