diff mbox

Make objfile::static_links an htab_up

Message ID 20190407231631.8513-1-tom@tromey.com
State New
Headers show

Commit Message

Tom Tromey April 7, 2019, 11:16 p.m. UTC
This changes objfile::static_links to be an htab_up, so that ~objfile
no longer has to explicitly destroy it.

Tested by the buildbot.

gdb/ChangeLog
2019-04-07  Tom Tromey  <tom@tromey.com>

	* symfile.c (reread_symbols): Update.
	* objfiles.c (objfile_register_static_link)
	(objfile_lookup_static_link): Update
	(~objfile) Don't delete static_links.
	* objfiles.h (struct objfile) <static_links>: Now an htab_up.
---
 gdb/ChangeLog  |  8 ++++++++
 gdb/objfiles.c | 16 +++++-----------
 gdb/objfiles.h |  2 +-
 gdb/symfile.c  |  2 +-
 4 files changed, 15 insertions(+), 13 deletions(-)

Comments

Tom Tromey April 19, 2019, 8:11 p.m. UTC | #1
>>>>> "Tom" == Tom Tromey <tom@tromey.com> writes:

Tom> This changes objfile::static_links to be an htab_up, so that ~objfile
Tom> no longer has to explicitly destroy it.

Tom> Tested by the buildbot.

Tom> gdb/ChangeLog
Tom> 2019-04-07  Tom Tromey  <tom@tromey.com>

Tom> 	* symfile.c (reread_symbols): Update.
Tom> 	* objfiles.c (objfile_register_static_link)
Tom> 	(objfile_lookup_static_link): Update
Tom> 	(~objfile) Don't delete static_links.
Tom> 	* objfiles.h (struct objfile) <static_links>: Now an htab_up.

I'm going to check this in now.

Tom
diff mbox

Patch

diff --git a/gdb/objfiles.c b/gdb/objfiles.c
index 1c95e068842..ec8393d65d5 100644
--- a/gdb/objfiles.c
+++ b/gdb/objfiles.c
@@ -231,14 +231,14 @@  objfile_register_static_link (struct objfile *objfile,
   struct static_link_htab_entry *entry;
 
   if (objfile->static_links == NULL)
-    objfile->static_links = htab_create_alloc
+    objfile->static_links.reset (htab_create_alloc
       (1, &static_link_htab_entry_hash, static_link_htab_entry_eq, NULL,
-       xcalloc, xfree);
+       xcalloc, xfree));
 
   /* Create a slot for the mapping, make sure it's the first mapping for this
      block and then create the mapping itself.  */
   lookup_entry.block = block;
-  slot = htab_find_slot (objfile->static_links, &lookup_entry, INSERT);
+  slot = htab_find_slot (objfile->static_links.get (), &lookup_entry, INSERT);
   gdb_assert (*slot == NULL);
 
   entry = XOBNEW (&objfile->objfile_obstack, static_link_htab_entry);
@@ -260,9 +260,8 @@  objfile_lookup_static_link (struct objfile *objfile,
   if (objfile->static_links == NULL)
     return NULL;
   lookup_entry.block = block;
-  entry
-    = (struct static_link_htab_entry *) htab_find (objfile->static_links,
-						   &lookup_entry);
+  entry = ((struct static_link_htab_entry *)
+	   htab_find (objfile->static_links.get (), &lookup_entry));
   if (entry == NULL)
     return NULL;
 
@@ -685,11 +684,6 @@  objfile::~objfile ()
 
   /* Rebuild section map next time we need it.  */
   get_objfile_pspace_data (pspace)->section_map_dirty = 1;
-
-  /* Free the map for static links.  There's no need to free static link
-     themselves since they were allocated on the objstack.  */
-  if (static_links != NULL)
-    htab_delete (static_links);
 }
 
 /* Free all the object files at once and clean up their users.  */
diff --git a/gdb/objfiles.h b/gdb/objfiles.h
index 368d9f3abe2..0e2ebb9238e 100644
--- a/gdb/objfiles.h
+++ b/gdb/objfiles.h
@@ -550,7 +550,7 @@  struct objfile
      Very few blocks have a static link, so it's more memory efficient to
      store these here rather than in struct block.  Static links must be
      allocated on the objfile's obstack.  */
-  htab_t static_links {};
+  htab_up static_links;
 };
 
 /* Declarations for functions defined in objfiles.c */
diff --git a/gdb/symfile.c b/gdb/symfile.c
index dbfc306c521..5178cf0b7ba 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -2556,7 +2556,7 @@  reread_symbols (void)
 	  objfile->sections = NULL;
 	  objfile->compunit_symtabs = NULL;
 	  objfile->template_symbols = NULL;
-	  objfile->static_links = NULL;
+	  objfile->static_links.reset (nullptr);
 
 	  /* obstack_init also initializes the obstack so it is
 	     empty.  We could use obstack_specify_allocation but