deduplicate abort implementations #139103
Open
+68
−134
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Currently, the code for process aborts is duplicated across `panic_abort` and `std`. This PR uses `#[rustc_std_internal_symbol]` to make the `std` implementation available to `panic_abort` via the linker, thereby deduplicating the code.
rustbot
added
O-hermit
|
These commits modify the If this was unintentional then you should revert the changes before this PR is merged. |
This comment has been minimized.
This comment has been minimized.
|
The Miri subtree was changed cc @rust-lang/miri |
|
The job Click to see the possible cause of the failure (guessed by this bot) |
RalfJung
reviewed
Apr 1, 2025
Comment on lines
+333
to
+337
| /// In Windows 8 and later, this will terminate the process immediately without | ||
| /// running any in-process exception handlers. In earlier versions of Windows, | ||
| /// this sequence of instructions will be treated as an access violation, | ||
| /// terminating the process but without necessarily bypassing all exception | ||
| /// handlers. |
There was a problem hiding this comment.
Suggested change
| /// In Windows 8 and later, this will terminate the process immediately without | |
| /// running any in-process exception handlers. In earlier versions of Windows, | |
| /// this sequence of instructions will be treated as an access violation, | |
| /// terminating the process but without necessarily bypassing all exception | |
| /// handlers. | |
| /// In Windows 8 and later, this will terminate the process immediately, | |
| /// bypassing all in-process exception handlers. In earlier versions of Windows, | |
| /// this sequence of instructions will be treated as an access violation, | |
| /// terminating the process but without necessarily bypassing all exception | |
| /// handlers. |
Let's use the same verb both times, otherwise this is unnecessarily confusing since it uses "without" twice to actually make statements that are opposites of each other.
RalfJung
reviewed
Apr 1, 2025
| @@ -1,6 +1,6 @@ | |||
| //@error-in-other-file: the program aborted execution | |||
| //@normalize-stderr-test: "\| +\^+" -> "| ^" | |||
| //@normalize-stderr-test: "unsafe \{ libc::abort\(\); \}|core::intrinsics::abort\(\);" -> "ABORT();" | |||
| //@normalize-stderr-test: "unsafe \{ libc::abort\(\) \}|core::intrinsics::abort\(\)" -> "ABORT()" | |||
There was a problem hiding this comment.
Suggested change
| //@normalize-stderr-test: "unsafe \{ libc::abort\(\) \}|core::intrinsics::abort\(\)" -> "ABORT()" | |
| //@normalize-stderr-test: "unsafe \{ libc::abort\(\) \}|crate::intrinsics::abort\(\)" -> "ABORT()" |
tgross35
reviewed
Apr 8, 2025
Comment on lines
+120
to
+123
| // Note: contrary to the `__rust_abort` in `crate::rt`, this uses `no_mangle` | ||
| // because it is actually used from C code. Because symbols annotated with | ||
| // #[rustc_std_internal_symbol] get mangled, this will not lead to linker | ||
| // conflicts. |
There was a problem hiding this comment.
Could they get different symbol names? Having the same extern signature reused but distinguished by attributes is a bit tricky.
rustbot
removed
the
S-waiting-on-review
|
Reminder, once the PR becomes ready for a review, use |
rustbot
added
the
S-waiting-on-author
|
Makes sense for now. In the future maybe we could make panic_abort and panic_unwind depend on std rather than the other way around. Both of them are only used with std, but currently std has a kind of weak dependency on panic_abort and panic_unwind where both get registered into the crate store (and thus for example participate in the duplicate lang item check), but only one of the two will actually "activated" and end up getting linked in the end. Flipping the dependency around would allow getting rid of this weird dependency state and allow directly using libstd symbols from both crates. |
|
☔ The latest upstream changes (presumably #139746) made this pull request unmergeable. Please resolve the merge conflicts. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently, the code for process aborts is duplicated across
panic_abortandstd. This PR uses#[rustc_std_internal_symbol]to make thestdimplementation available topanic_abortvia the linker, thereby deduplicating the code.