darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* dwarf2read.c (init_cutu_and_read_dies): Revert patch from

Browse source 
2013-07-22.
This commit is contained in:
Tom Tromey 2013-07-23 06:56:53 +00:00
parent 2eb14a9b5c
commit 365156ada1
2 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gdb/ChangeLog
View file

@ -1,3 +1,8 @@
2013-07-23 Tom Tromey <tromey@redhat.com>
* dwarf2read.c (init_cutu_and_read_dies): Revert patch from
2013-07-22.
2013-07-22 Doug Evans <dje@google.com> 2013-07-22 Doug Evans <dje@google.com>
* exec.h (remove_target_sections): Delete arg abfd. * exec.h (remove_target_sections): Delete arg abfd.

33
gdb/dwarf2read.c
View file

@ -5015,7 +5015,7 @@ init_cutu_and_read_dies (struct dwarf2_per_cu_data *this_cu,
struct die_info *comp_unit_die; struct die_info *comp_unit_die;
int has_children; int has_children;
struct attribute *attr; struct attribute *attr;
struct cleanup *cleanups; struct cleanup *cleanups, *free_cu_cleanup = NULL;
struct signatured_type *sig_type = NULL; struct signatured_type *sig_type = NULL;
struct dwarf2_section_info *abbrev_section; struct dwarf2_section_info *abbrev_section;
/* Non-zero if CU currently points to a DWO file and we need to /* Non-zero if CU currently points to a DWO file and we need to
@ -5074,7 +5074,7 @@ init_cutu_and_read_dies (struct dwarf2_per_cu_data *this_cu,
init_one_comp_unit (cu, this_cu); init_one_comp_unit (cu, this_cu);
/* If an error occurs while loading, release our storage. */ /* If an error occurs while loading, release our storage. */
make_cleanup (free_heap_comp_unit, cu); free_cu_cleanup = make_cleanup (free_heap_comp_unit, cu);
} }
/* Get the header. */ /* Get the header. */
@ -5203,22 +5203,27 @@ init_cutu_and_read_dies (struct dwarf2_per_cu_data *this_cu,
die_reader_func (&reader, info_ptr, comp_unit_die, has_children, data); die_reader_func (&reader, info_ptr, comp_unit_die, has_children, data);
/* Done, clean up. */ /* Done, clean up. */
if (keep) if (free_cu_cleanup != NULL)
{ {
/* We've successfully allocated this compilation unit. Let our if (keep)
caller clean it up when finished with it. */ {
discard_cleanups (cleanups); /* We've successfully allocated this compilation unit. Let our
caller clean it up when finished with it. */
discard_cleanups (free_cu_cleanup);
/* We can only discard free_cu_cleanup and all subsequent cleanups. /* We can only discard free_cu_cleanup and all subsequent cleanups.
So we have to manually free the abbrev table. */ So we have to manually free the abbrev table. */
dwarf2_free_abbrev_table (cu); dwarf2_free_abbrev_table (cu);
/* Link this CU into read_in_chain. */ /* Link this CU into read_in_chain. */
this_cu->cu->read_in_chain = dwarf2_per_objfile->read_in_chain; this_cu->cu->read_in_chain = dwarf2_per_objfile->read_in_chain;
dwarf2_per_objfile->read_in_chain = this_cu; dwarf2_per_objfile->read_in_chain = this_cu;
}
else
do_cleanups (free_cu_cleanup);
} }
else
do_cleanups (cleanups); do_cleanups (cleanups);
} }
/* Read CU/TU THIS_CU in section SECTION, /* Read CU/TU THIS_CU in section SECTION,