Skip to content

rustc_codegen_ssa: fix get_rpath_relative_to_output panic when lib only contains file name #125861

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.

Sign up for GitHub

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

Jump to bottom
Merged
bors merged 1 commit into from
Jun 5, 2024
Merged

rustc_codegen_ssa: fix get_rpath_relative_to_output panic when lib only contains file name #125861

bors merged 1 commit into from
Jun 5, 2024

Conversation

@name1e5s
Copy link
Contributor

@name1e5s name1e5s commented Jun 1, 2024

When compiles program with -C rpath=yes but with no output filename specified, or with filename ONLY, we will get an ICE for now. Fix it by treat empty output path in get_rpath_relative_to_output as current dir.

Before this patch:

rustc -C prefer_dynamic=yes -C rpath=yes -O h.rs # ICE, no output filename specified rustc -o hello -C prefer_dynamic=yes -C rpath=yes -O h.rs # ICE, output filename has no path rustc -o ./hello -C prefer_dynamic=yes -C rpath=yes -O h.rs # Works

All those examples work after the patch.

Close #119571.
Close #125785.
@rustbot
Copy link
Collaborator

rustbot commented Jun 1, 2024

r? @michaelwoerister

rustbot has assigned @michaelwoerister.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jun 1, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@name1e5s name1e5s force-pushed the fix/rpath_null_panic branch from 153de76 to 5e802f0 Compare June 1, 2024 16:14
@michaelwoerister
Copy link
Member

michaelwoerister commented Jun 5, 2024

Thanks for the PR, @name1e5s! Looks good to me.

@bors r+ rollup
@bors
Copy link
Collaborator

bors commented Jun 5, 2024

📌 Commit 5e802f0 has been approved by michaelwoerister

It is now in the queue for this repository.
@bors
Copy link
Collaborator

bors commented Jun 5, 2024

🌲 The tree is currently closed for pull requests below priority 101. This pull request will be tested once the tree is reopened.
@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 5, 2024
@matthiaskrgr matthiaskrgr mentioned this pull request Jun 5, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 5, 2024
@bors
Auto merge of rust-lang#126037 - matthiaskrgr:rollup-7pz1nhr, r=matth…
7ebd2bd 
…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#124746 (`rustc --explain E0582` additional example) - rust-lang#125407 (Detect when user is trying to create a lending `Iterator` and give a custom explanation) - rust-lang#125505 (Add intra-doc-links to rustc_middle crate-level docs.) - rust-lang#125792 (Don't drop `Unsize` candidate in intercrate mode) - rust-lang#125819 (Various `HirTyLowerer` cleanups) - rust-lang#125861 (rustc_codegen_ssa: fix `get_rpath_relative_to_output` panic when lib only contains file name) - rust-lang#125911 (delete bootstrap build before switching to bumped rustc) - rust-lang#125921 (coverage: Carve out hole spans in a separate early pass) - rust-lang#125940 (std::unix::fs::get_path: using fcntl codepath for netbsd instead.) - rust-lang#126022 (set `has_unconstrained_ty_var` when generalizing aliases in bivariant contexts) r? `@ghost` `@rustbot` modify labels: rollup
@bors bors merged commit e2ea7d8 into rust-lang:master Jun 5, 2024
@rustbot rustbot added this to the 1.80.0 milestone Jun 5, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jun 5, 2024
@rust-timer
Unrolled build for rust-lang#125861
1032944 
Rollup merge of rust-lang#125861 - name1e5s:fix/rpath_null_panic, r=michaelwoerister rustc_codegen_ssa: fix `get_rpath_relative_to_output` panic when lib only contains file name <!-- If this PR is related to an unstable feature or an otherwise tracked effort, please link to the relevant tracking issue here. If you don't know of a related tracking issue or there are none, feel free to ignore this. This PR will get automatically assigned to a reviewer. In case you would like a specific user to review your work, you can assign it to them by using r​? <reviewer name> --> When compiles program with `-C rpath=yes` but with no output filename specified, or with filename ONLY, we will get an ICE for now. Fix it by treat empty `output` path in `get_rpath_relative_to_output` as current dir. Before this patch: ```bash rustc -C prefer_dynamic=yes -C rpath=yes -O h.rs # ICE, no output filename specified rustc -o hello -C prefer_dynamic=yes -C rpath=yes -O h.rs # ICE, output filename has no path rustc -o ./hello -C prefer_dynamic=yes -C rpath=yes -O h.rs # Works ``` All those examples work after the patch. Close rust-lang#119571. Close rust-lang#125785.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

5 participants

@name1e5s @rustbot @rust-log-analyzer @michaelwoerister @bors