From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 48) id 4CF943850402; Thu, 21 Jan 2021 07:58:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4CF943850402 From: "jakub at redhat dot com" To: dwz@sourceware.org Subject: [Bug default/27212] ./dwz: xxx: Invalid DW_AT_decl_file file number 20 Date: Thu, 21 Jan 2021 07:58:31 +0000 X-Bugzilla-Reason: CC X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: dwz X-Bugzilla-Component: default X-Bugzilla-Version: unspecified X-Bugzilla-Keywords: X-Bugzilla-Severity: normal X-Bugzilla-Who: jakub at redhat dot com X-Bugzilla-Status: NEW X-Bugzilla-Resolution: X-Bugzilla-Priority: P2 X-Bugzilla-Assigned-To: nobody at sourceware dot org X-Bugzilla-Target-Milestone: --- X-Bugzilla-Flags: X-Bugzilla-Changed-Fields: Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: http://sourceware.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 X-BeenThere: dwz@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Dwz mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Jan 2021 07:58:31 -0000 https://sourceware.org/bugzilla/show_bug.cgi?id=3D27212 --- Comment #9 from Jakub Jelinek --- author Jakub Jelinek =20=20=20=20=20=20=20=20 Thu, 21 Jan 2021 07:43:08 +0000 (08:43 +0100) committer Jakub Jelinek =20=20=20=20=20=20=20=20 Thu, 21 Jan 2021 07:43:08 +0000 (08:43 +0100) commit 47af8da7c8533924e96d1dbd97625b6a4dc35855 tree 4a924fd99e9ee98dcc4125836309dff06de39b19 tree parent 40d5efd4edc52a7d2ed02f8400a9beb129053271 commit | diff Assorted DW_FORM_implicit_const fixes 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_c= onst is done only in write_die which is called either recursively or from write_info/write_types. Which means the DW_FORM_implicit_const value encod= ed in the abbrev was never updated. Other fixes include hashing the DW_FORM_implicit_const value in checksum_die and more importantly comparing the values in die_eq_1. 2021-01-21 Jakub Jelinek PR dwz/27212 PR dwz/27213 * dwz.c (checksum_die): For DW_FORM_implicit_const hash t->values[i]. (die_eq_1): For DW_FORM_implicit_const compare t?->values[?]. (build_abbrevs_for_die): For DW_FORM_implicit_const on DW_AT_*_file call line_htab_lookup too and store the result into t->values[j]. Otherwise, handle even file ids larger than 32-bit. (write_die): For DW_FORM_implicit_const on DW_AT_*_file just j++ and continue, don't call line_htab_lookup nor adjust anything. Simplify. (alt_clear_dups): Fix function comment. --=20 You are receiving this mail because: You are on the CC list for the bug.=