Reduce special casing for the panic runtime #140809

bjorn3 · 2025-05-08T15:06:51Z

See the individual commits for more info.

rustbot · 2025-05-08T15:06:56Z

rustbot has assigned @compiler-errors.
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 · 2025-05-08T15:06:59Z

Some changes occurred in compiler/rustc_codegen_ssa

cc @WaffleLapkin

bjorn3 · 2025-05-08T15:08:02Z

I was looking at making panic_abort and panic_unwind depend on libstd (#139103 (comment)). These changes make this easier, though is still blocked on the fact that when compiling libstd as dylib, panic_unwind already needs to be present.

rustbot · 2025-05-08T16:10:52Z

The Miri subtree was changed

cc @rust-lang/miri

bors · 2025-05-09T05:04:01Z

☔ The latest upstream changes (presumably #140176) made this pull request unmergeable. Please resolve the merge conflicts.

bors · 2025-05-17T11:10:50Z

☔ The latest upstream changes (presumably #141024) made this pull request unmergeable. Please resolve the merge conflicts.

bors · 2025-05-19T09:42:09Z

☔ The latest upstream changes (presumably #141238) made this pull request unmergeable. Please resolve the merge conflicts.

bors · 2025-06-01T11:47:38Z

☔ The latest upstream changes (presumably #141730) made this pull request unmergeable. Please resolve the merge conflicts.

rustc_std_internal_symbol is meant to call functions from crates where there is no direct dependency on said crate. As they either have to be added to symbols.o or rustc has to introduce an implicit dependency on them to avoid linker errors. The latter is done for some things like the panic runtime, but adding these symbols to symbols.o allows removing those implicit dependencies.

This used to be necessary for a correct linker order, but ever since the introduction of symbols.o adding the symbols in question to symbols.o would work just as well. We do still add dependencies on the panic runtime to the local crate, but not for #![needs_panic_runtime] crates. This also removes the runtime-depends-on-needs-runtime test. inject_dependency_if used to emit this error, but with symbols.o it is no longer important that there is no dependency and in fact it may be nice to have panic_abort and panic_unwind directly depend on libstd in the future for calling std::process::abort().

You shouldn't ever need to explicitly depend on it. And we weren't checking that the panic runtime used the correct panic strategy either.

There is already panic-unwind to enable it.

wesleywiser · 2025-06-05T14:22:47Z

r? wesleywiser

wesleywiser · 2025-06-06T15:29:15Z

Compiler changes look good to me but I'd like someone from libs to review the change in exposed standard library features to make sure there's no concerns there.

r? libs

…sleywiser,ibraheemdev Reduce special casing for the panic runtime See the individual commits for more info.

Rollup of 11 pull requests Successful merges: - #140809 (Reduce special casing for the panic runtime) - #141608 (Add support for repetition to `proc_macro::quote`) - #141864 (Handle win32 separator for cygwin paths) - #142216 (Miscellaneous RefCell cleanups) - #142517 (Windows: Use anonymous pipes in Command) - #142570 (Reject union default field values) - #142584 (Handle same-crate macro for borrowck semicolon suggestion) - #142585 (Update books) - #142586 (Fold unnecessary `visit_struct_field_def` in AstValidator) - #142595 (Revert overeager warning for misuse of `--print native-static-libs`) - #142598 (Set elf e_flags on ppc64 targets according to abi) r? `@ghost` `@rustbot` modify labels: rollup

…sleywiser,ibraheemdev Reduce special casing for the panic runtime See the individual commits for more info.

workingjubilee · 2025-06-17T07:48:11Z

vibes-based judgement:
@bors rollup=iffy

bors · 2025-06-17T13:20:52Z

⌛ Testing commit 6df5456 with merge 242d148...

…braheemdev Reduce special casing for the panic runtime See the individual commits for more info.

bors · 2025-06-17T15:07:42Z

💔 Test failed - checks-actions

bjorn3 · 2025-06-17T15:57:58Z

I think LTO is causing the #[rustc_std_internal_symbol] functions to be internalized, making it impossible to reference them from symbols.o. I suspect the same would already happen for non-public #[thread_local] statics on Windows because of the thread local shim.

bjorn3 · 2025-06-17T16:48:34Z

@bors2 try jobs=x86_64-msvc-1,x86_64-msvc-2

rust-bors · 2025-06-17T16:48:39Z

⌛ Trying commit 6e801de with merge dd3c68b…

To cancel the try build, run the command @bors2 try cancel.

Reduce special casing for the panic runtime See the individual commits for more info. try-job: x86_64-msvc-1 try-job: x86_64-msvc-2

bjorn3 · 2025-06-17T17:04:38Z

@bors2 try cancel
@bors2 try jobs=x86_64-msvc-1,x86_64-msvc-2

rust-bors · 2025-06-17T17:04:40Z

Try build cancelled. Cancelled workflows:

https://github.com/rust-lang/rust/actions/runs/15713276815

rust-bors · 2025-06-17T17:04:42Z

⌛ Trying commit 2489701 with merge a21c332…

To cancel the try build, run the command @bors2 try cancel.

Reduce special casing for the panic runtime See the individual commits for more info. try-job: x86_64-msvc-1 try-job: x86_64-msvc-2

rust-bors · 2025-06-17T19:40:48Z

💔 Test failed

CI ❌

rustbot · 2025-06-17T20:24:57Z

This PR modifies run-make tests.

cc @jieyouxu

bjorn3 · 2025-06-17T20:27:31Z

Updated the test that unstably includes the panic_unwind panic runtime without libstd to use #[rustc_std_internal_symbol] for the symbols that panic_unwind needs.

@bors2 try jobs=x86_64-msvc-1,x86_64-msvc-2

rust-bors · 2025-06-17T20:27:37Z

⌛ Trying commit b46f424 with merge dec7734…

To cancel the try build, run the command @bors2 try cancel.

Reduce special casing for the panic runtime See the individual commits for more info. try-job: x86_64-msvc-1 try-job: x86_64-msvc-2

rustbot assigned compiler-errors May 8, 2025

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. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels May 8, 2025

This comment has been minimized.

Sign in to view

bjorn3 force-pushed the panic_runtime_cleanup branch from 6d4613c to c7e8663 Compare May 8, 2025 16:10

This comment has been minimized.

Sign in to view

bjorn3 force-pushed the panic_runtime_cleanup branch from c7e8663 to 93cf365 Compare May 8, 2025 17:55

bjorn3 force-pushed the panic_runtime_cleanup branch from 93cf365 to a9d5498 Compare May 9, 2025 09:41

bjorn3 force-pushed the panic_runtime_cleanup branch from d730005 to 7d0f158 Compare May 18, 2025 14:16

bjorn3 force-pushed the panic_runtime_cleanup branch from 7d0f158 to 0dfacc7 Compare May 19, 2025 09:54

bjorn3 added 5 commits June 3, 2025 08:55

Stop handling explicit dependencies on the panic runtime

3a7ae67

You shouldn't ever need to explicitly depend on it. And we weren't checking that the panic runtime used the correct panic strategy either.

Avoid exporting panic_unwind as stdlib cargo feature

f8d1bfa

There is already panic-unwind to enable it.

Make comment on activate_injected_dep a doc comment

6df5456

bjorn3 force-pushed the panic_runtime_cleanup branch from 0dfacc7 to 6df5456 Compare June 3, 2025 09:01

rustbot assigned wesleywiser and unassigned compiler-errors Jun 5, 2025

wesleywiser approved these changes Jun 6, 2025

View reviewed changes

jhpratt added a commit to jhpratt/rust that referenced this pull request Jun 17, 2025

Rollup merge of rust-lang#140809 - bjorn3:panic_runtime_cleanup, r=we…

3b9ae23

…sleywiser,ibraheemdev Reduce special casing for the panic runtime See the individual commits for more info.

jhpratt mentioned this pull request Jun 17, 2025

Rollup of 11 pull requests #142604

Closed

workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Jun 17, 2025

Rollup merge of rust-lang#140809 - bjorn3:panic_runtime_cleanup, r=we…

d5c6ba3

…sleywiser,ibraheemdev Reduce special casing for the panic runtime See the individual commits for more info.

workingjubilee mentioned this pull request Jun 17, 2025

Rollup of 9 pull requests #142615

Closed

bors added a commit that referenced this pull request Jun 17, 2025

Auto merge of #140809 - bjorn3:panic_runtime_cleanup, r=wesleywiser,i…

242d148

…braheemdev Reduce special casing for the panic runtime See the individual commits for more info.

This comment has been minimized.

Sign in to view

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 17, 2025

rust-bors bot added a commit that referenced this pull request Jun 17, 2025

Auto merge of #140809 - bjorn3:panic_runtime_cleanup, r=<try>

dd3c68b

Reduce special casing for the panic runtime See the individual commits for more info. try-job: x86_64-msvc-1 try-job: x86_64-msvc-2

This comment has been minimized.

Sign in to view

Fix LTO for internalizing rustc_std_internal_symbol symbols

2489701

bjorn3 force-pushed the panic_runtime_cleanup branch from 6e801de to 2489701 Compare June 17, 2025 17:04

rust-bors bot added a commit that referenced this pull request Jun 17, 2025

Auto merge of #140809 - bjorn3:panic_runtime_cleanup, r=<try>

a21c332

Reduce special casing for the panic runtime See the individual commits for more info. try-job: x86_64-msvc-1 try-job: x86_64-msvc-2

Fix circular dependency test to use rustc_std_internal_symbol

b46f424

rustbot added the A-run-make Area: port run-make Makefiles to rmake.rs label Jun 17, 2025

rust-bors bot added a commit that referenced this pull request Jun 17, 2025

Auto merge of #140809 - bjorn3:panic_runtime_cleanup, r=<try>

dec7734

Reduce special casing for the panic runtime See the individual commits for more info. try-job: x86_64-msvc-1 try-job: x86_64-msvc-2

Reduce special casing for the panic runtime #140809

Are you sure you want to change the base?

Reduce special casing for the panic runtime #140809

Conversation

bjorn3 commented May 8, 2025

Uh oh!

rustbot commented May 8, 2025

Uh oh!

rustbot commented May 8, 2025

Uh oh!

bjorn3 commented May 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment has been minimized.

rustbot commented May 8, 2025

Uh oh!

This comment has been minimized.

bors commented May 9, 2025

Uh oh!

bors commented May 17, 2025

Uh oh!

bors commented May 19, 2025

Uh oh!

bors commented Jun 1, 2025

Uh oh!

wesleywiser commented Jun 5, 2025

Uh oh!

wesleywiser commented Jun 6, 2025

Uh oh!

workingjubilee commented Jun 17, 2025

Uh oh!

bors commented Jun 17, 2025

Uh oh!

This comment has been minimized.

bors commented Jun 17, 2025

Uh oh!

bjorn3 commented Jun 17, 2025

Uh oh!

bjorn3 commented Jun 17, 2025

Uh oh!

rust-bors bot commented Jun 17, 2025

Uh oh!

This comment has been minimized.

bjorn3 commented Jun 17, 2025

Uh oh!

rust-bors bot commented Jun 17, 2025

Uh oh!

rust-bors bot commented Jun 17, 2025

Uh oh!

rust-bors bot commented Jun 17, 2025

Uh oh!

rustbot commented Jun 17, 2025

Uh oh!

bjorn3 commented Jun 17, 2025

Uh oh!

rust-bors bot commented Jun 17, 2025

Uh oh!

Uh oh!

bjorn3 commented May 8, 2025 •

edited

Loading