diff options
| author | Simon Marchi <simon.marchi@efficios.com> | 2020-02-28 10:07:46 -0500 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@polymtl.ca> | 2020-02-28 10:07:46 -0500 |
| commit | 4ebe487749c5a3bac19ccaf36fc734a0d29a990e (patch) | |
| tree | d77eba763b97d58e8e4e01b5caacdad85a2457e2 /gdb/dwarf2 | |
| parent | 13c3a74afb50b240dbacfd60f91414eae50279ad (diff) | |
| download | gdb-4ebe487749c5a3bac19ccaf36fc734a0d29a990e.zip gdb-4ebe487749c5a3bac19ccaf36fc734a0d29a990e.tar.gz gdb-4ebe487749c5a3bac19ccaf36fc734a0d29a990e.tar.bz2 | |
Pass correct die_reader_specs in cutu_reader::init_tu_and_read_dwo_dies
Running anything with the fission.exp board fails since commit
c0ab21c22bb ("Replace init_cutu_and_read_dies with a class").
GDB crashes while reading the DWARF info. cu is NULL in
read_signatured_type:
Thread 1 "gdb" received signal SIGSEGV, Segmentation fault.
0x000055555780663e in read_signatured_type
sig_type=0x6210000c3600) at /home/simark/src/binutils-gdb/gdb/dwarf2/read.c:22782
22782 gdb_assert (cu->die_hash == NULL);
(top-gdb) bt
#0 0x000055555780663e in read_signatured_type (sig_type=0x6210000c3600) at /home/simark/src/binutils-gdb/gdb/dwarf2/read.c:22782
#1 0x00005555578062dd in load_full_type_unit (per_cu=0x6210000c3600) at /home/simark/src/binutils-gdb/gdb/dwarf2/read.c:22758
#2 0x00005555577c5fb7 in queue_and_load_dwo_tu (slot=0x60600007fc00, info=0x6210000c34e0) at /home/simark/src/binutils-gdb/gdb/dwarf2/read.c:12674
#3 0x0000555559934232 in htab_traverse_noresize (htab=0x60b000063670, callback=0x5555577c5e61 <queue_and_load_dwo_tu(void**, void*)>, info=0x6210000c34e0)
at /home/simark/src/binutils-gdb/libiberty/hashtab.c:775
#4 0x00005555577c6252 in queue_and_load_all_dwo_tus (per_cu=0x6210000c34e0) at /home/simark/src/binutils-gdb/gdb/dwarf2/read.c:12701
#5 0x000055555777ebd8 in dw2_do_instantiate_symtab (per_cu=0x6210000c34e0, skip_partial=false) at /home/simark/src/binutils-gdb/gdb/dwarf2/read.c:2371
#6 0x000055555777eea2 in dw2_instantiate_symtab (per_cu=0x6210000c34e0, skip_partial=false) at /home/simark/src/binutils-gdb/gdb/dwarf2/read.c:2395
#7 0x0000555557786ab6 in dw2_lookup_symbol (objfile=0x614000007240, block_index=GLOBAL_BLOCK, name=0x602000025310 "main", domain=VAR_DOMAIN)
at /home/simark/src/binutils-gdb/gdb/dwarf2/read.c:3539
After creating the reader object, the reader.cu field should not be
NULL. By checking the commit previous to the faulty one mentioned
above, I noticed that the cu field is normally set by
init_cu_die_reader, called from read_cutu_die_from_dwo, itself called
from cutu_reader::init_tu_and_read_dwo_dies, itself called from
cutu_reader's constructor.
However, cutu_reader::init_tu_and_read_dwo_dies calls
read_cutu_die_from_dwo, passing a pointer to a local `die_reader_specs`
variable. So it's the `cu` field of that object that gets set.
cutu_reader itself is a `die_reader_specs` (it inherits from it), and
the intention was most likely to pass `this` to read_cutu_die_from_dwo.
This way, the fields of the cutu_reader object, which
read_signatured_type will use, are set.
With this, I am able to use:
make check RUNTESTFLAGS='--target_board=fission'
and it looks much better. There are still some failures to be
investigated, but that's the usual state of the testsuite.
gdb/ChangeLog:
* dwarf2/read.c (cutu_reader::init_tu_and_read_dwo_dies): Remove
reader variable, pass `this` to read_cutu_die_from_dwo.
Diffstat (limited to 'gdb/dwarf2')
| -rw-r--r-- | gdb/dwarf2/read.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index f52b1dd..07cee58 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -6774,7 +6774,6 @@ cutu_reader::init_tu_and_read_dwo_dies (struct dwarf2_per_cu_data *this_cu, int use_existing_cu) { struct signatured_type *sig_type; - struct die_reader_specs reader; /* Verify we can do the following downcast, and that we have the data we need. */ @@ -6802,7 +6801,7 @@ cutu_reader::init_tu_and_read_dwo_dies (struct dwarf2_per_cu_data *this_cu, if (read_cutu_die_from_dwo (this_cu, sig_type->dwo_unit, NULL /* stub_comp_unit_die */, sig_type->dwo_unit->dwo_file->comp_dir, - &reader, &info_ptr, + this, &info_ptr, &comp_unit_die, &m_dwo_abbrev_table) == 0) { |