-
Notifications
You must be signed in to change notification settings - Fork 12.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Apply path remapping to DW_AT_GNU_dwo_name when producing split DWARF #91566
Conversation
r? @oli-obk (rust-highfive has picked a reviewer for you, use r? to override) |
cc @davidtwco I saw you mention dwp on zulip recently |
I don't have time to do a full review right now (will take a closer look tomorrow), but we could probably do this without breaking packaging: As rustc invokes the dwarf packaging utility (rather than that being part of a separate build process), we can just always provide the paths to the object files directly rather than just rely on the path computed in the packaging utility from |
r? @davidtwco |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Implementation looks good to me, are there other changes you want to make (the PR is marked WIP)?
I marked it as draft because I didn't really know if this will work and I wanted to see the Linux CI run results (I'm on Windows so can't really test DWARF properly). I'll remove WIP and I'm happy to merge as-is once bors is happy too |
This comment has been minimized.
This comment has been minimized.
Turns out my test actually wasn't doing anything and This acutally came up before #82074. Will look into it later |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
I misunderstood how rust/compiler/rustc_codegen_llvm/src/back/write.rs Lines 913 to 924 in 4a66a70
And eventually rust/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp Lines 644 to 656 in 4a66a70
So the LLVM change is not needed and the current solution works |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me, comment or two about some changes but broadly what I'd expect.
This reverts commit 3281022.
@bors r+ |
📌 Commit 5e481d0 has been approved by |
Apply path remapping to DW_AT_GNU_dwo_name when producing split DWARF `--remap-path-prefix` doesn't apply to paths to `.o` (in case of packed) or `.dwo` (in case of unpacked) files in `DW_AT_GNU_dwo_name`. GCC also has this bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91888
Apply path remapping to DW_AT_GNU_dwo_name when producing split DWARF `--remap-path-prefix` doesn't apply to paths to `.o` (in case of packed) or `.dwo` (in case of unpacked) files in `DW_AT_GNU_dwo_name`. GCC also has this bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91888
…askrgr Rollup of 7 pull requests Successful merges: - rust-lang#91566 (Apply path remapping to DW_AT_GNU_dwo_name when producing split DWARF) - rust-lang#91926 (Remove `in_band_lifetimes` from `rustc_metadata`) - rust-lang#91931 (Remove `in_band_lifetimes` from `rustc_codegen_llvm`) - rust-lang#92024 (rustc_codegen_llvm: Give each codegen unit a unique DWARF name on all platforms, not just Apple ones.) - rust-lang#92037 (Use a const ParamEnv when in default_method_body_is_const) - rust-lang#92047 (Set `RUST_BACKTRACE=0` when running location-detail tests) - rust-lang#92050 (Add a space and 2 grave accents ) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
--remap-path-prefix
doesn't apply to paths to.o
(in case of packed) or.dwo
(in case of unpacked) files inDW_AT_GNU_dwo_name
. GCC also has this bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91888