diff options
| author | Simon Marchi <simon.marchi@efficios.com> | 2023-01-31 10:57:21 -0500 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@efficios.com> | 2023-01-31 13:01:11 -0500 |
| commit | cd07187f238b4d0135f2e331810cc5995a8be8f3 (patch) | |
| tree | a81107f5b54db27a2250016bb2a454d53751d821 /gdb/dwarf2 | |
| parent | d7789889b1839c3c0f64c6738b0d8517ccead049 (diff) | |
| download | gdb-cd07187f238b4d0135f2e331810cc5995a8be8f3.zip gdb-cd07187f238b4d0135f2e331810cc5995a8be8f3.tar.gz gdb-cd07187f238b4d0135f2e331810cc5995a8be8f3.tar.bz2 | |
gdb: add nullptr check to cooked_index_functions::dump
Since commit 7d82b08e9e0a ("gdb/dwarf: dump cooked index contents in
cooked_index_functions::dump"), we see:
maint print objfiles /home/smarchi/build/binutils-gdb/gdb/testsuite/outputs/gdb.dwarf2/dw2-error/dw2-error^M
^M
Object file /home/smarchi/build/binutils-gdb/gdb/testsuite/outputs/gdb.dwarf2/dw2-error/dw2-error: Objfile at 0x614000005040, bfd at 0x6120000e08c0, 15 minsyms^M
^M
Cooked index in use:^M
^M
/home/smarchi/src/binutils-gdb/gdb/../gdbsupport/gdb-checked-static-cast.h:58: internal-error: checked_static_cast: Assertion `result != nullptr' failed.^M
A problem internal to GDB has been detected,^M
further debugging may prove unreliable.^M
----- Backtrace -----^M
FAIL: gdb.dwarf2/dw2-error.exp: maint print objfiles /home/smarchi/build/binutils-gdb/gdb/testsuite/outputs/gdb.dwarf2/dw2-error/dw2-error (GDB internal error)
The problem is that when cooked_index_functions fails to build an index,
per_objfile->index_table is nullptr. Therefore, add a nullptr check,
like other methods of cooked_index_functions already do.
Print the "Cooked index in use" message after the nullptr check, such
that if the cooked index failed to build, that message is not printed.
Change-Id: Id67aef592e76c41b1e3bde9838a4e36cef873253
Diffstat (limited to 'gdb/dwarf2')
| -rw-r--r-- | gdb/dwarf2/read.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index e8a3e35..6cee22a 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -18589,14 +18589,15 @@ struct cooked_index_functions : public dwarf2_base_index_functions void dump (struct objfile *objfile) override { - gdb_printf ("Cooked index in use:\n"); - gdb_printf ("\n"); - dwarf2_per_objfile *per_objfile = get_dwarf2_per_objfile (objfile); cooked_index_vector *index = (gdb::checked_static_cast<cooked_index_vector *> - (per_objfile->per_bfd->index_table.get ())); + (per_objfile->per_bfd->index_table.get ())); + if (index == nullptr) + return; + gdb_printf ("Cooked index in use:\n"); + gdb_printf ("\n"); index->dump (objfile->arch ()); } |