diff options
author | Tom Tromey <tromey@redhat.com> | 2011-07-20 15:06:54 +0000 |
---|---|---|
committer | Tom Tromey <tromey@redhat.com> | 2011-07-20 15:06:54 +0000 |
commit | 8b70b953ba15d6f6b1357d4e2186dca8a58bb4b2 (patch) | |
tree | 06794fc46e100d9a76c260cbc89cbd77a6300272 | |
parent | 2275a1a7443865c1b2b08e54421cabc481697ce3 (diff) | |
download | fsf-binutils-gdb-8b70b953ba15d6f6b1357d4e2186dca8a58bb4b2.zip fsf-binutils-gdb-8b70b953ba15d6f6b1357d4e2186dca8a58bb4b2.tar.gz fsf-binutils-gdb-8b70b953ba15d6f6b1357d4e2186dca8a58bb4b2.tar.bz2 |
PR symtab/12984:
* dwarf2read.c (dwarf2_section_info_def): New typedef.
(struct dwarf2_per_objfile) <types>: Change to a VEC.
(struct dwarf2_per_cu_data) <from_debug_types>: Remove.
<debug_type_section>: New field.
(dwarf2_locate_sections): Push .debug_types sections onto VEC.
(load_cu): Use appropriate section.
(create_signatured_type_table_from_index): Add 'section'
argument.
(dwarf2_read_index): Only allow a single .debug_types section.
(dw2_get_file_names): Use appropriate section.
(read_type_comp_unit_head): Add 'section' argument.
(create_debug_types_hash_table): Loop over all .debug_types
sections.
(init_cu_die_reader): Use appropriate section.
(process_psymtab_comp_unit, load_partial_comp_unit)
(load_full_comp_unit, read_die_and_children, find_partial_die)
(lookup_die_type, determine_prefix, follow_die_offset): Update.
(lookup_signatured_type_at_offset): Add 'section' argument.
(read_signatured_type_at_offset): Add 'sect' argument.
(read_signatured_type): Use appropriate section.
(set_die_type, get_die_type_at_offset): Update.
(dwarf2_per_objfile_free): Free all .debug_types sections, and
VEC.
(write_psymtabs_to_index): Don't allow index with more than one
.debug_types section.
-rw-r--r-- | gdb/ChangeLog | 29 | ||||
-rw-r--r-- | gdb/dwarf2read.c | 290 |
2 files changed, 201 insertions, 118 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4d9eb04..ca053d2 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,32 @@ +2011-07-20 Tom Tromey <tromey@redhat.com> + + PR symtab/12984: + * dwarf2read.c (dwarf2_section_info_def): New typedef. + (struct dwarf2_per_objfile) <types>: Change to a VEC. + (struct dwarf2_per_cu_data) <from_debug_types>: Remove. + <debug_type_section>: New field. + (dwarf2_locate_sections): Push .debug_types sections onto VEC. + (load_cu): Use appropriate section. + (create_signatured_type_table_from_index): Add 'section' + argument. + (dwarf2_read_index): Only allow a single .debug_types section. + (dw2_get_file_names): Use appropriate section. + (read_type_comp_unit_head): Add 'section' argument. + (create_debug_types_hash_table): Loop over all .debug_types + sections. + (init_cu_die_reader): Use appropriate section. + (process_psymtab_comp_unit, load_partial_comp_unit) + (load_full_comp_unit, read_die_and_children, find_partial_die) + (lookup_die_type, determine_prefix, follow_die_offset): Update. + (lookup_signatured_type_at_offset): Add 'section' argument. + (read_signatured_type_at_offset): Add 'sect' argument. + (read_signatured_type): Use appropriate section. + (set_die_type, get_die_type_at_offset): Update. + (dwarf2_per_objfile_free): Free all .debug_types sections, and + VEC. + (write_psymtabs_to_index): Don't allow index with more than one + .debug_types section. + 2011-07-19 Jan Kratochvil <jan.kratochvil@redhat.com> Fix crash if referenced CU is aged out. diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index a84d356..a373b09 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -145,6 +145,9 @@ struct dwarf2_section_info int readin; }; +typedef struct dwarf2_section_info dwarf2_section_info_def; +DEF_VEC_O (dwarf2_section_info_def); + /* All offsets in the index are of this type. It must be architecture-independent. */ typedef uint32_t offset_type; @@ -186,11 +189,12 @@ struct dwarf2_per_objfile struct dwarf2_section_info macinfo; struct dwarf2_section_info str; struct dwarf2_section_info ranges; - struct dwarf2_section_info types; struct dwarf2_section_info frame; struct dwarf2_section_info eh_frame; struct dwarf2_section_info gdb_index; + VEC (dwarf2_section_info_def) *types; + /* Back link. */ struct objfile *objfile; @@ -447,9 +451,9 @@ struct dwarf2_per_cu_data hash table and don't find it. */ unsigned int load_all_dies : 1; - /* Non-zero if this CU is from .debug_types. - Otherwise it's from .debug_info. */ - unsigned int from_debug_types : 1; + /* Non-null if this CU is from .debug_types; in which case it points + to the section. Otherwise it's from .debug_info. */ + struct dwarf2_section_info *debug_type_section; /* Set to non-NULL iff this CU is currently loaded. When it gets freed out of the CU cache it gets reset to NULL again. */ @@ -1204,6 +1208,7 @@ static struct die_info *follow_die_sig (struct die_info *, struct dwarf2_cu **); static void read_signatured_type_at_offset (struct objfile *objfile, + struct dwarf2_section_info *sect, unsigned int offset); static void read_signatured_type (struct objfile *, @@ -1455,8 +1460,14 @@ dwarf2_locate_sections (bfd *abfd, asection *sectp, void *vnames) } else if (section_is_p (sectp->name, &names->types)) { - dwarf2_per_objfile->types.asection = sectp; - dwarf2_per_objfile->types.size = bfd_get_section_size (sectp); + struct dwarf2_section_info type_section; + + memset (&type_section, 0, sizeof (type_section)); + type_section.asection = sectp; + type_section.size = bfd_get_section_size (sectp); + + VEC_safe_push (dwarf2_section_info_def, dwarf2_per_objfile->types, + &type_section); } else if (section_is_p (sectp->name, &names->gdb_index)) { @@ -1798,8 +1809,10 @@ create_quick_file_names_table (unsigned int nr_initial_entries) static void load_cu (struct dwarf2_per_cu_data *per_cu) { - if (per_cu->from_debug_types) - read_signatured_type_at_offset (per_cu->objfile, per_cu->offset); + if (per_cu->debug_type_section) + read_signatured_type_at_offset (per_cu->objfile, + per_cu->debug_type_section, + per_cu->offset); else load_full_comp_unit (per_cu, per_cu->objfile); @@ -1929,6 +1942,7 @@ create_cus_from_index (struct objfile *objfile, const gdb_byte *cu_list, static int create_signatured_type_table_from_index (struct objfile *objfile, + struct dwarf2_section_info *section, const gdb_byte *bytes, offset_type elements) { @@ -1959,7 +1973,7 @@ create_signatured_type_table_from_index (struct objfile *objfile, struct signatured_type); type_sig->signature = signature; type_sig->type_offset = type_offset; - type_sig->per_cu.from_debug_types = 1; + type_sig->per_cu.debug_type_section = section; type_sig->per_cu.offset = offset; type_sig->per_cu.objfile = objfile; type_sig->per_cu.v.quick @@ -2187,10 +2201,23 @@ dwarf2_read_index (struct objfile *objfile) if (!create_cus_from_index (objfile, cu_list, cu_list_elements)) return 0; - if (types_list_elements - && !create_signatured_type_table_from_index (objfile, types_list, - types_list_elements)) - return 0; + if (types_list_elements) + { + struct dwarf2_section_info *section; + + /* We can only handle a single .debug_types when we have an + index. */ + if (VEC_length (dwarf2_section_info_def, dwarf2_per_objfile->types) != 1) + return 0; + + section = VEC_index (dwarf2_section_info_def, + dwarf2_per_objfile->types, 0); + + if (!create_signatured_type_table_from_index (objfile, section, + types_list, + types_list_elements)) + return 0; + } create_addrmap_from_index (objfile, map); @@ -2244,8 +2271,8 @@ dw2_get_file_names (struct objfile *objfile, init_one_comp_unit (&cu, objfile); cleanups = make_cleanup (free_stack_comp_unit, &cu); - if (this_cu->from_debug_types) - sec = &dwarf2_per_objfile->types; + if (this_cu->debug_type_section) + sec = this_cu->debug_type_section; else sec = &dwarf2_per_objfile->info; dwarf2_read_section (objfile, sec); @@ -2268,7 +2295,7 @@ dw2_get_file_names (struct objfile *objfile, dwarf2_read_abbrevs (abfd, &cu); make_cleanup (dwarf2_free_abbrev_table, &cu); - if (this_cu->from_debug_types) + if (this_cu->debug_type_section) info_ptr += 8 /*signature*/ + cu.header.offset_size; init_cu_die_reader (&reader_specs, &cu); read_full_die (&reader_specs, &comp_unit_die, info_ptr, @@ -2936,14 +2963,14 @@ partial_read_comp_unit_head (struct comp_unit_head *header, gdb_byte *info_ptr, static gdb_byte * read_type_comp_unit_head (struct comp_unit_head *cu_header, + struct dwarf2_section_info *section, ULONGEST *signature, gdb_byte *types_ptr, bfd *abfd) { gdb_byte *initial_types_ptr = types_ptr; - dwarf2_read_section (dwarf2_per_objfile->objfile, - &dwarf2_per_objfile->types); - cu_header->offset = types_ptr - dwarf2_per_objfile->types.buffer; + dwarf2_read_section (dwarf2_per_objfile->objfile, section); + cu_header->offset = types_ptr - section->buffer; types_ptr = read_comp_unit_head (cu_header, types_ptr, abfd); @@ -3071,91 +3098,104 @@ add_signatured_type_cu_to_list (void **slot, void *datum) static int create_debug_types_hash_table (struct objfile *objfile) { - gdb_byte *info_ptr; - htab_t types_htab; + htab_t types_htab = NULL; struct dwarf2_per_cu_data **iter; + int ix; + struct dwarf2_section_info *section; - dwarf2_read_section (objfile, &dwarf2_per_objfile->types); - info_ptr = dwarf2_per_objfile->types.buffer; - - if (info_ptr == NULL) + if (VEC_empty (dwarf2_section_info_def, dwarf2_per_objfile->types)) { dwarf2_per_objfile->signatured_types = NULL; return 0; } - types_htab = allocate_signatured_type_table (objfile); + for (ix = 0; + VEC_iterate (dwarf2_section_info_def, dwarf2_per_objfile->types, + ix, section); + ++ix) + { + gdb_byte *info_ptr, *end_ptr; - if (dwarf2_die_debug) - fprintf_unfiltered (gdb_stdlog, "Signatured types:\n"); + dwarf2_read_section (objfile, section); + info_ptr = section->buffer; - while (info_ptr < dwarf2_per_objfile->types.buffer - + dwarf2_per_objfile->types.size) - { - unsigned int offset; - unsigned int offset_size; - unsigned int type_offset; - unsigned int length, initial_length_size; - unsigned short version; - ULONGEST signature; - struct signatured_type *type_sig; - void **slot; - gdb_byte *ptr = info_ptr; + if (info_ptr == NULL) + continue; - offset = ptr - dwarf2_per_objfile->types.buffer; + if (types_htab == NULL) + types_htab = allocate_signatured_type_table (objfile); - /* We need to read the type's signature in order to build the hash - table, but we don't need to read anything else just yet. */ + if (dwarf2_die_debug) + fprintf_unfiltered (gdb_stdlog, "Signatured types:\n"); - /* Sanity check to ensure entire cu is present. */ - length = read_initial_length (objfile->obfd, ptr, &initial_length_size); - if (ptr + length + initial_length_size - > dwarf2_per_objfile->types.buffer + dwarf2_per_objfile->types.size) + end_ptr = info_ptr + section->size; + while (info_ptr < end_ptr) { - complaint (&symfile_complaints, - _("debug type entry runs off end " - "of `.debug_types' section, ignored")); - break; - } + unsigned int offset; + unsigned int offset_size; + unsigned int type_offset; + unsigned int length, initial_length_size; + unsigned short version; + ULONGEST signature; + struct signatured_type *type_sig; + void **slot; + gdb_byte *ptr = info_ptr; - offset_size = initial_length_size == 4 ? 4 : 8; - ptr += initial_length_size; - version = bfd_get_16 (objfile->obfd, ptr); - ptr += 2; - ptr += offset_size; /* abbrev offset */ - ptr += 1; /* address size */ - signature = bfd_get_64 (objfile->obfd, ptr); - ptr += 8; - type_offset = read_offset_1 (objfile->obfd, ptr, offset_size); - - type_sig = obstack_alloc (&objfile->objfile_obstack, sizeof (*type_sig)); - memset (type_sig, 0, sizeof (*type_sig)); - type_sig->signature = signature; - type_sig->type_offset = type_offset; - type_sig->per_cu.objfile = objfile; - type_sig->per_cu.from_debug_types = 1; - type_sig->per_cu.offset = offset; + offset = ptr - section->buffer; - slot = htab_find_slot (types_htab, type_sig, INSERT); - gdb_assert (slot != NULL); - if (*slot != NULL) - { - const struct signatured_type *dup_sig = *slot; + /* We need to read the type's signature in order to build the hash + table, but we don't need to read anything else just yet. */ - complaint (&symfile_complaints, - _("debug type entry at offset 0x%x is duplicate to the " - "entry at offset 0x%x, signature 0x%s"), - offset, dup_sig->per_cu.offset, - phex (signature, sizeof (signature))); - gdb_assert (signature == dup_sig->signature); - } - *slot = type_sig; + /* Sanity check to ensure entire cu is present. */ + length = read_initial_length (objfile->obfd, ptr, + &initial_length_size); + if (ptr + length + initial_length_size > end_ptr) + { + complaint (&symfile_complaints, + _("debug type entry runs off end " + "of `.debug_types' section, ignored")); + break; + } - if (dwarf2_die_debug) - fprintf_unfiltered (gdb_stdlog, " offset 0x%x, signature 0x%s\n", - offset, phex (signature, sizeof (signature))); + offset_size = initial_length_size == 4 ? 4 : 8; + ptr += initial_length_size; + version = bfd_get_16 (objfile->obfd, ptr); + ptr += 2; + ptr += offset_size; /* abbrev offset */ + ptr += 1; /* address size */ + signature = bfd_get_64 (objfile->obfd, ptr); + ptr += 8; + type_offset = read_offset_1 (objfile->obfd, ptr, offset_size); + + type_sig = obstack_alloc (&objfile->objfile_obstack, sizeof (*type_sig)); + memset (type_sig, 0, sizeof (*type_sig)); + type_sig->signature = signature; + type_sig->type_offset = type_offset; + type_sig->per_cu.objfile = objfile; + type_sig->per_cu.debug_type_section = section; + type_sig->per_cu.offset = offset; + + slot = htab_find_slot (types_htab, type_sig, INSERT); + gdb_assert (slot != NULL); + if (*slot != NULL) + { + const struct signatured_type *dup_sig = *slot; - info_ptr = info_ptr + initial_length_size + length; + complaint (&symfile_complaints, + _("debug type entry at offset 0x%x is duplicate to the " + "entry at offset 0x%x, signature 0x%s"), + offset, dup_sig->per_cu.offset, + phex (signature, sizeof (signature))); + gdb_assert (signature == dup_sig->signature); + } + *slot = type_sig; + + if (dwarf2_die_debug) + fprintf_unfiltered (gdb_stdlog, " offset 0x%x, signature 0x%s\n", + offset, phex (signature, sizeof (signature))); + + info_ptr = info_ptr + initial_length_size + length; + } } dwarf2_per_objfile->signatured_types = types_htab; @@ -3201,10 +3241,10 @@ init_cu_die_reader (struct die_reader_specs *reader, { reader->abfd = cu->objfile->obfd; reader->cu = cu; - if (cu->per_cu->from_debug_types) + if (cu->per_cu->debug_type_section) { - gdb_assert (dwarf2_per_objfile->types.readin); - reader->buffer = dwarf2_per_objfile->types.buffer; + gdb_assert (cu->per_cu->debug_type_section->readin); + reader->buffer = cu->per_cu->debug_type_section->buffer; } else { @@ -3305,13 +3345,13 @@ process_psymtab_comp_unit (struct objfile *objfile, make_cleanup (dwarf2_free_abbrev_table, &cu); /* Read the compilation unit die. */ - if (this_cu->from_debug_types) + if (this_cu->debug_type_section) info_ptr += 8 /*signature*/ + cu.header.offset_size; init_cu_die_reader (&reader_specs, &cu); info_ptr = read_full_die (&reader_specs, &comp_unit_die, info_ptr, &has_children); - if (this_cu->from_debug_types) + if (this_cu->debug_type_section) { /* LENGTH has not been set yet for type units. */ gdb_assert (this_cu->offset == cu.header.offset); @@ -3407,7 +3447,7 @@ process_psymtab_comp_unit (struct objfile *objfile, info_ptr = (beg_of_comp_unit + cu.header.length + cu.header.initial_length_size); - if (this_cu->from_debug_types) + if (this_cu->debug_type_section) { /* It's not clear we want to do anything with stmt lists here. Waiting to see what gcc ultimately does. */ @@ -3436,11 +3476,12 @@ process_type_comp_unit (void **slot, void *info) this_cu = &entry->per_cu; - gdb_assert (dwarf2_per_objfile->types.readin); + gdb_assert (this_cu->debug_type_section->readin); process_psymtab_comp_unit (objfile, this_cu, - dwarf2_per_objfile->types.buffer, - dwarf2_per_objfile->types.buffer + this_cu->offset, - dwarf2_per_objfile->types.size); + this_cu->debug_type_section->buffer, + (this_cu->debug_type_section->buffer + + this_cu->offset), + this_cu->debug_type_section->size); return 1; } @@ -3549,7 +3590,7 @@ load_partial_comp_unit (struct dwarf2_per_cu_data *this_cu, struct die_reader_specs reader_specs; int read_cu = 0; - gdb_assert (! this_cu->from_debug_types); + gdb_assert (! this_cu->debug_type_section); gdb_assert (dwarf2_per_objfile->info.readin); info_ptr = dwarf2_per_objfile->info.buffer + this_cu->offset; @@ -4548,7 +4589,7 @@ load_full_comp_unit (struct dwarf2_per_cu_data *per_cu, struct attribute *attr; int read_cu = 0; - gdb_assert (! per_cu->from_debug_types); + gdb_assert (! per_cu->debug_type_section); /* Set local variables from the partial symbol table info. */ offset = per_cu->offset; @@ -8790,11 +8831,9 @@ read_die_and_children (const struct die_reader_specs *reader, { fprintf_unfiltered (gdb_stdlog, "\nRead die from %s of %s:\n", - reader->buffer == dwarf2_per_objfile->info.buffer - ? ".debug_info" - : reader->buffer == dwarf2_per_objfile->types.buffer - ? ".debug_types" - : "unknown section", + (reader->cu->per_cu->debug_type_section + ? ".debug_types" + : ".debug_info"), reader->abfd->filename); dump_die (result, dwarf2_die_debug); } @@ -9580,7 +9619,7 @@ find_partial_die (unsigned int offset, struct dwarf2_cu *cu) struct dwarf2_per_cu_data *per_cu = NULL; struct partial_die_info *pd = NULL; - if (cu->per_cu->from_debug_types) + if (cu->per_cu->debug_type_section) { pd = find_partial_die_in_comp_unit (offset, cu); if (pd != NULL) @@ -9743,7 +9782,7 @@ fixup_partial_die (struct partial_die_info *part_die, NOTE: We need to do this even if cu->has_namespace_info != 0. gcc-4.5 -gdwarf-4 can drop the enclosing namespace. */ if (cu->language == language_cplus - && dwarf2_per_objfile->types.asection != NULL + && !VEC_empty (dwarf2_section_info_def, dwarf2_per_objfile->types) && part_die->die_parent == NULL && part_die->has_children && (part_die->tag == DW_TAG_class_type @@ -11920,7 +11959,7 @@ lookup_die_type (struct die_info *die, struct attribute *attr, "at 0x%x [in module %s]"), die->offset, cu->objfile->name); - gdb_assert (sig_type->per_cu.from_debug_types); + gdb_assert (sig_type->per_cu.debug_type_section); offset = sig_type->per_cu.offset + sig_type->type_offset; this_type = get_die_type_at_offset (offset, &sig_type->per_cu); } @@ -12262,7 +12301,7 @@ determine_prefix (struct die_info *die, struct dwarf2_cu *cu) case DW_TAG_compile_unit: /* gcc-4.5 -gdwarf-4 can drop the enclosing namespace. Cope. */ if (cu->language == language_cplus - && dwarf2_per_objfile->types.asection != NULL + && !VEC_empty (dwarf2_section_info_def, dwarf2_per_objfile->types) && die->child != NULL && (die->tag == DW_TAG_class_type || die->tag == DW_TAG_structure_type @@ -13774,7 +13813,7 @@ follow_die_offset (unsigned int offset, struct dwarf2_cu **ref_cu) target_cu = cu; - if (cu->per_cu->from_debug_types) + if (cu->per_cu->debug_type_section) { /* .debug_types CUs cannot reference anything outside their CU. If they need to, they have to reference a signatured type via @@ -13949,9 +13988,11 @@ follow_die_sig (struct die_info *src_die, struct attribute *attr, /* Given an offset of a signatured type, return its signatured_type. */ static struct signatured_type * -lookup_signatured_type_at_offset (struct objfile *objfile, unsigned int offset) +lookup_signatured_type_at_offset (struct objfile *objfile, + struct dwarf2_section_info *section, + unsigned int offset) { - gdb_byte *info_ptr = dwarf2_per_objfile->types.buffer + offset; + gdb_byte *info_ptr = section->buffer + offset; unsigned int length, initial_length_size; unsigned int sig_offset; struct signatured_type find_entry, *type_sig; @@ -13976,15 +14017,16 @@ lookup_signatured_type_at_offset (struct objfile *objfile, unsigned int offset) static void read_signatured_type_at_offset (struct objfile *objfile, + struct dwarf2_section_info *sect, unsigned int offset) { struct signatured_type *type_sig; - dwarf2_read_section (objfile, &dwarf2_per_objfile->types); + dwarf2_read_section (objfile, sect); /* We have the section offset, but we need the signature to do the hash table lookup. */ - type_sig = lookup_signatured_type_at_offset (objfile, offset); + type_sig = lookup_signatured_type_at_offset (objfile, sect, offset); gdb_assert (type_sig->per_cu.cu == NULL); @@ -14004,9 +14046,10 @@ read_signatured_type (struct objfile *objfile, struct dwarf2_cu *cu; ULONGEST signature; struct cleanup *back_to, *free_cu_cleanup; + struct dwarf2_section_info *section = type_sig->per_cu.debug_type_section; - dwarf2_read_section (objfile, &dwarf2_per_objfile->types); - types_ptr = dwarf2_per_objfile->types.buffer + type_sig->per_cu.offset; + dwarf2_read_section (objfile, section); + types_ptr = section->buffer + type_sig->per_cu.offset; gdb_assert (type_sig->per_cu.cu == NULL); @@ -14019,7 +14062,7 @@ read_signatured_type (struct objfile *objfile, /* If an error occurs while loading, release our storage. */ free_cu_cleanup = make_cleanup (free_one_comp_unit, cu); - types_ptr = read_type_comp_unit_head (&cu->header, &signature, + types_ptr = read_type_comp_unit_head (&cu->header, section, &signature, types_ptr, objfile->obfd); gdb_assert (signature == type_sig->signature); @@ -15387,7 +15430,7 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu) && !HAVE_GNAT_AUX_INFO (type)) INIT_GNAT_SPECIFIC (type); - if (cu->per_cu->from_debug_types) + if (cu->per_cu->debug_type_section) type_hash_ptr = &dwarf2_per_objfile->debug_types_type_hash; else type_hash_ptr = &dwarf2_per_objfile->debug_info_type_hash; @@ -15427,7 +15470,7 @@ get_die_type_at_offset (unsigned int offset, struct dwarf2_offset_and_type *slot, ofs; htab_t type_hash; - if (per_cu->from_debug_types) + if (per_cu->debug_type_section) type_hash = dwarf2_per_objfile->debug_types_type_hash; else type_hash = dwarf2_per_objfile->debug_info_type_hash; @@ -15584,6 +15627,8 @@ static void dwarf2_per_objfile_free (struct objfile *objfile, void *d) { struct dwarf2_per_objfile *data = d; + int ix; + struct dwarf2_section_info *section; /* This is sorted according to the order they're defined in to make it easier to keep in sync. */ @@ -15594,10 +15639,16 @@ dwarf2_per_objfile_free (struct objfile *objfile, void *d) munmap_section_buffer (&data->macinfo); munmap_section_buffer (&data->str); munmap_section_buffer (&data->ranges); - munmap_section_buffer (&data->types); munmap_section_buffer (&data->frame); munmap_section_buffer (&data->eh_frame); munmap_section_buffer (&data->gdb_index); + + for (ix = 0; + VEC_iterate (dwarf2_section_info_def, data->types, ix, section); + ++ix) + munmap_section_buffer (section); + + VEC_free (dwarf2_section_info_def, data->types); } @@ -16185,6 +16236,9 @@ write_psymtabs_to_index (struct objfile *objfile, const char *dir) if (dwarf2_per_objfile->using_index) error (_("Cannot use an index to create the index")); + if (VEC_length (dwarf2_section_info_def, dwarf2_per_objfile->types) > 1) + error (_("Cannot make an index when the file has multiple .debug_types sections")); + if (stat (objfile->name, &st) < 0) perror_with_name (objfile->name); |