[15/38] Change dwarf2_per_objfile::type_unit_groups to htab_up
Commit Message
This changes dwarf2_per_objfile::type_unit_groups to be an htab_up,
again allowing us to move the memory used by the hash table from the
objfile obstack to the heap.
gdb/ChangeLog
2020-01-22 Tom Tromey <tom@tromey.com>
* dwarf2/read.c (allocate_type_unit_groups_table): Return
htab_up. Don't allocate on obstack.
(get_type_unit_group, dwarf2_build_psymtabs_hard): Update.
* dwarf2/read.h (struct dwarf2_per_objfile) <type_unit_groups>:
Change type to htab_up.
Change-Id: Ia045df0ff3ec30aac813da5a9a2314a607ef7ec8
---
gdb/ChangeLog | 8 ++++++++
gdb/dwarf2/read.c | 17 +++++++----------
gdb/dwarf2/read.h | 2 +-
3 files changed, 16 insertions(+), 11 deletions(-)
@@ -7527,16 +7527,13 @@ eq_type_unit_group (const void *item_lhs, const void *item_rhs)
/* Allocate a hash table for type unit groups. */
-static htab_t
+static htab_up
allocate_type_unit_groups_table (struct objfile *objfile)
{
- return htab_create_alloc_ex (3,
- hash_type_unit_group,
- eq_type_unit_group,
- NULL,
- &objfile->objfile_obstack,
- hashtab_obstack_allocate,
- dummy_obstack_deallocate);
+ return htab_up (htab_create_alloc (3,
+ hash_type_unit_group,
+ eq_type_unit_group,
+ NULL, xcalloc, xfree));
}
/* Type units that don't have DW_AT_stmt_list are grouped into their own
@@ -7632,7 +7629,7 @@ get_type_unit_group (struct dwarf2_cu *cu, const struct attribute *stmt_list)
type_unit_group_for_lookup.hash.dwo_unit = cu->dwo_unit;
type_unit_group_for_lookup.hash.line_sect_off = (sect_offset) line_offset;
- slot = htab_find_slot (dwarf2_per_objfile->type_unit_groups,
+ slot = htab_find_slot (dwarf2_per_objfile->type_unit_groups.get (),
&type_unit_group_for_lookup, INSERT);
if (*slot != NULL)
{
@@ -8201,7 +8198,7 @@ dwarf2_build_psymtabs_hard (struct dwarf2_per_objfile *dwarf2_per_objfile)
/* Now that all TUs have been processed we can fill in the dependencies. */
if (dwarf2_per_objfile->type_unit_groups != NULL)
{
- htab_traverse_noresize (dwarf2_per_objfile->type_unit_groups,
+ htab_traverse_noresize (dwarf2_per_objfile->type_unit_groups.get (),
build_type_psymtab_dependencies, dwarf2_per_objfile);
}
@@ -152,7 +152,7 @@ public:
/* Table of struct type_unit_group objects.
The hash key is the DW_AT_stmt_list value. */
- htab_t type_unit_groups {};
+ htab_up type_unit_groups;
/* A table mapping .debug_types signatures to its signatured_type entry.
This is NULL if the .debug_types section hasn't been read in yet. */