From: "jakub at redhat dot com" <sourceware-bugzilla@sourceware.org>
To: dwz@sourceware.org
Subject: [Bug default/27212] ./dwz: xxx: Invalid DW_AT_decl_file file number 20
Date: Wed, 20 Jan 2021 19:40:53 +0000 [thread overview]
Message-ID: <bug-27212-11298-4mrAhbAoTe@http.sourceware.org/bugzilla/> (raw)
In-Reply-To: <bug-27212-11298@http.sourceware.org/bugzilla/>
https://sourceware.org/bugzilla/show_bug.cgi?id=27212
--- Comment #4 from Jakub Jelinek <jakub at redhat dot com> ---
So, I think part of the fix should be:
--- dwz.c.jj 2021-01-18 10:18:21.288726894 +0100
+++ dwz.c 2021-01-20 20:14:35.361320394 +0100
@@ -10456,7 +10456,9 @@ build_abbrevs_for_die (htab_t h, dw_cu_r
case DW_FORM_data4: value = read_32 (ptr); break;
case DW_FORM_data8: value = read_64 (ptr); break;
case DW_FORM_udata: value = read_uleb128 (ptr); break;
- case DW_FORM_implicit_const: break;
+ case DW_FORM_implicit_const:
+ value = reft->values[i];
+ break;
default:
error (0, 0, "Unhandled %s for %s",
get_DW_FORM_str (form),
@@ -10465,10 +10467,12 @@ build_abbrevs_for_die (htab_t h, dw_cu_r
}
/* Note that the value is only used for calculating the
DIE size and possibly change form. Doesn't change the
- implicit_const from or value. */
+ implicit_const form or value, but line_htab_lookup
+ needs to be called anyway, so that it records the used
+ file. */
+ value = line_htab_lookup (refcu, value);
if (form != DW_FORM_implicit_const)
{
- value = line_htab_lookup (refcu, value);
if (value <= 0xff)
{
form = DW_FORM_data1;
But that doesn't really help to fix this completely.
The problem is I think that write_abbrev is always called before write_info,
and the remapping of the DW_AT_decl_file/DW_AT_call_file DW_FORM_implicit_const
is done only in write_die which is called either recursively or from
write_info/write_types.
--
You are receiving this mail because:
You are on the CC list for the bug.
next prev parent reply other threads:[~2021-01-20 19:40 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-20 8:38 [Bug default/27212] New: " jakub at redhat dot com
2021-01-20 10:59 ` [Bug default/27212] " mark at klomp dot org
2021-01-20 18:06 ` jakub at redhat dot com
2021-01-20 18:28 ` jakub at redhat dot com
2021-01-20 19:40 ` jakub at redhat dot com [this message]
2021-01-20 19:43 ` jakub at redhat dot com
2021-01-20 21:15 ` mark at klomp dot org
2021-01-20 21:32 ` jakub at redhat dot com
2021-01-20 21:56 ` mark at klomp dot org
2021-01-21 7:58 ` jakub at redhat dot com
2021-02-08 15:51 ` mark at klomp dot org
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=bug-27212-11298-4mrAhbAoTe@http.sourceware.org/bugzilla/ \
--to=sourceware-bugzilla@sourceware.org \
--cc=dwz@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).