From: Tom de Vries <tdevries@suse.de>
To: dwz@sourceware.org, jakub@redhat.com
Subject: [committed] Fix dump_type and dump_die_with_indent in low-mem mode
Date: Tue, 01 Jan 2019 00:00:00 -0000 [thread overview]
Message-ID: <20191201090901.GA31343@delia> (raw)
Hi,
When using --devel-dump-dies in combination with low-mem mode, we run into a
segfault:
...
$ dwz cc1 --devel-dump-dies -l0 2>/dev/null
Segmentation fault (core dumped)
...
which is a regression caused by commit 6eedbd7 "Dump more information with
--devel-dump-dies".
The segfault is caused by trying to access invalidated fields in a DIE with
die_collapsed_child set.
Fix this by handling die_collapsed_child == 1 in dump_type and
dump_die_with_indent.
Committed to trunk.
Thanks,
- Tom
Fix dump_type and dump_die_with_indent in low-mem mode
2019-11-30 Tom de Vries <tdevries@suse.de>
* dwz.c (dump_type, dump_die_with_indent): Handle
die_collapsed_child == 1.
---
dwz.c | 30 ++++++++++++++++++++----------
1 file changed, 20 insertions(+), 10 deletions(-)
diff --git a/dwz.c b/dwz.c
index f68a81c..e92e9d8 100644
--- a/dwz.c
+++ b/dwz.c
@@ -4136,6 +4136,8 @@ dump_type (dw_die_ref die)
{
bool present;
enum dwarf_form form;
+ if (die->die_collapsed_child)
+ return;
unsigned int value = get_AT_int (die, DW_AT_type, &present, &form);
if (!present)
return;
@@ -4149,14 +4151,14 @@ dump_type (dw_die_ref die)
value = cu->cu_offset + value;
fprintf (stderr, " (type: %x", value);
ref = off_htab_lookup (cu, value);
- if (ref != NULL)
+ if (ref != NULL && !ref->die_collapsed_child)
{
const char *type_name = get_AT_string (ref, DW_AT_name);
if (type_name)
fprintf (stderr, " %s", type_name);
+ fprintf (stderr, " %s", get_DW_TAG_name (ref->die_tag) + 7);
+ dump_type (ref);
}
- fprintf (stderr, " %s", get_DW_TAG_name (ref->die_tag) + 7);
- dump_type (ref);
fprintf (stderr, ")");
}
@@ -4164,13 +4166,21 @@ dump_type (dw_die_ref die)
static void
dump_die_with_indent (int indent, dw_die_ref die)
{
- const char *name = get_AT_string (die, DW_AT_name);
- fprintf (stderr, "%*s %x %c %x %x %s %s", indent, "", die->die_offset,
- die->die_ck_state == CK_KNOWN ? 'O' : 'X',
- (unsigned) die->u.p1.die_hash,
- (unsigned) die->u.p1.die_ref_hash, name ? name : "",
- get_DW_TAG_name (die->die_tag) + 7);
- dump_type (die);
+ if (die->die_collapsed_child)
+ {
+ fprintf (stderr, "%*s %x %c", indent, "", die->die_offset,
+ die->die_ck_state == CK_KNOWN ? 'O' : 'X');
+ }
+ else
+ {
+ const char *name = get_AT_string (die, DW_AT_name);
+ fprintf (stderr, "%*s %x %c %x %x %s %s", indent, "", die->die_offset,
+ die->die_ck_state == CK_KNOWN ? 'O' : 'X',
+ (unsigned) die->u.p1.die_hash,
+ (unsigned) die->u.p1.die_ref_hash, name ? name : "",
+ get_DW_TAG_name (die->die_tag) + 7);
+ dump_type (die);
+ }
fprintf (stderr, "\n");
}
reply other threads:[~2019-12-01 9:09 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20191201090901.GA31343@delia \
--to=tdevries@suse.de \
--cc=dwz@sourceware.org \
--cc=jakub@redhat.com \
/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).