From: Simon Marchi <simon.marchi@efficios.com>
To: gdb-patches@sourceware.org
Cc: Simon Marchi <simon.marchi@efficios.com>
Subject: [PATCH 2/2] gdb: add nullptr check to cooked_index_functions::dump
Date: Tue, 31 Jan 2023 10:57:21 -0500 [thread overview]
Message-ID: <20230131155721.21847-2-simon.marchi@efficios.com> (raw)
In-Reply-To: <20230131155721.21847-1-simon.marchi@efficios.com>
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
---
gdb/dwarf2/read.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index e8a3e359adaa..6cee22a3faa6 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 ());
}
--
2.39.1
next prev parent reply other threads:[~2023-01-31 15:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-31 15:57 [PATCH 1/2] gdbsupport: allow passing nullptr to checked_static_cast Simon Marchi
2023-01-31 15:57 ` Simon Marchi [this message]
2023-01-31 17:35 ` [PATCH 2/2] gdb: add nullptr check to cooked_index_functions::dump Tom Tromey
2023-01-31 18:22 ` Simon Marchi
2023-01-31 17:35 ` [PATCH 1/2] gdbsupport: allow passing nullptr to checked_static_cast Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230131155721.21847-2-simon.marchi@efficios.com \
--to=simon.marchi@efficios.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).