public inbox for gcc-bugs@sourceware.org
help / color / mirror / Atom feed
From: "cvs-commit at gcc dot gnu.org" <gcc-bugzilla@gcc.gnu.org>
To: gcc-bugs@gcc.gnu.org
Subject: [Bug debug/93865] .debug_line with LTO refers to bogus file-names
Date: Fri, 11 Sep 2020 07:48:11 +0000	[thread overview]
Message-ID: <bug-93865-4-l4ycuLJ6Sk@http.gcc.gnu.org/bugzilla/> (raw)
In-Reply-To: <bug-93865-4@http.gcc.gnu.org/bugzilla/>

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93865

--- Comment #7 from CVS Commits <cvs-commit at gcc dot gnu.org> ---
The releases/gcc-10 branch has been updated by Jakub Jelinek
<jakub@gcc.gnu.org>:

https://gcc.gnu.org/g:ceabd8fc7c299b3428f37e8c07b0c9662b119c75

commit r10-8736-gceabd8fc7c299b3428f37e8c07b0c9662b119c75
Author: Jakub Jelinek <jakub@redhat.com>
Date:   Thu Sep 10 11:25:02 2020 +0200

    lto: Stream current working directory for first streamed relative filename
and adjust relative paths [PR93865]

    If the gcc -c -flto ... commands to compile some or all objects are run in
a
    different directory (or in different directories) from the directory in
    which the gcc -flto link line is invoked, then the .debug_line will be
    incorrect if there are any relative filenames, it will use those relative
    filenames while .debug_info will contain a different DW_AT_comp_dir.

    The following patch streams (at most once after each clear_line_info)
    the current working directory (what we record in DW_AT_comp_dir) when
    encountering the first relative pathname, and when reading the location
info
    reads it back and if the current working directory at that point is
    different from the saved one, adjusts relative paths by adding a relative
    prefix how to go from the current working directory to the previously saved
    path (with a fallback e.g. for DOS e:\\foo vs. d:\\bar change to use
    absolute directory).

    2020-09-10  Jakub Jelinek  <jakub@redhat.com>

            PR debug/93865
            * lto-streamer.h (struct output_block): Add emit_pwd member.
            * lto-streamer-out.c: Include toplev.h.
            (clear_line_info): Set emit_pwd.
            (lto_output_location_1): Encode the ob->current_file != xloc.file
            bit directly into the location number.  If changing file, emit
            additionally a bit whether pwd is emitted and emit it before the
            first relative pathname since clear_line_info.
            (output_function, output_constructor): Don't call clear_line_info
            here.
            * lto-streamer-in.c (struct string_pair_map): New type.
            (struct string_pair_map_hasher): New type.
            (string_pair_map_hasher::hash): New method.
            (string_pair_map_hasher::equal): New method.
            (path_name_pair_hash_table, string_pair_map_allocator): New
variables.
            (relative_path_prefix, canon_relative_path_prefix,
            canon_relative_file_name): New functions.
            (canon_file_name): Add relative_prefix argument, if non-NULL
            and string is a relative path, return canon_relative_file_name.
            (lto_location_cache::input_location_and_block): Decode file change
            bit from the location number.  If changing file, unpack bit whether
            pwd is streamed and stream in pwd.  Adjust canon_file_name caller.
            (lto_free_file_name_hash): Delete path_name_pair_hash_table
            and string_pair_map_allocator.

    (cherry picked from commit 3d0af0c997fe42a7f0963d970a9c495b81041206)

  parent reply	other threads:[~2020-09-11  7:48 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <bug-93865-4@http.gcc.gnu.org/bugzilla/>
2020-07-26 15:50 ` mark at gcc dot gnu.org
2020-09-07 15:58 ` jakub at gcc dot gnu.org
2020-09-08  6:26 ` rguenther at suse dot de
2020-09-09 12:50 ` jakub at gcc dot gnu.org
2020-09-10  9:25 ` cvs-commit at gcc dot gnu.org
2020-09-11  7:48 ` cvs-commit at gcc dot gnu.org [this message]
2022-06-01 13:10 ` rguenth at gcc dot gnu.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-93865-4-l4ycuLJ6Sk@http.gcc.gnu.org/bugzilla/ \
    --to=gcc-bugzilla@gcc.gnu.org \
    --cc=gcc-bugs@gcc.gnu.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).