fix __rust_alloc_error_handler comment #77738
Merged
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
rust-highfive
added
the
S-waiting-on-review
RalfJung
force-pushed
the
alloc-error-handler-comment
branch
from
85f1075 to
1e6702c
Compare
RalfJung
commented
Oct 9, 2020
| // This is the magic symbol to call the global alloc error handler. rustc generates | ||
| // it to call `__rg_oom` if there is a `#[global_allocator]`, or uses the | ||
| // default implementations below (`__rdl_oom`) otherwise. | ||
| #[rustc_allocator_nounwind] |
There was a problem hiding this comment.
This attribute leaves me rather uneasy, since the default implementation does unwind... see https://github.com/rust-lang/rust/pull/76448/files#r502291279.
There was a problem hiding this comment.
I have no idea if it is safe or what else could happen. Presumably it will lead to unwinding edges on OOM calls which could have perf impact.
There was a problem hiding this comment.
EDIT (accidently removed): If it is safe, please remove... It was blindly copied.
There was a problem hiding this comment.
I think it's fine to leave the attribute for now.
RalfJung
force-pushed
the
alloc-error-handler-comment
branch
from
8e3dfdb to
fe07e5d
Compare
RalfJung
force-pushed
the
alloc-error-handler-comment
branch
from
fe07e5d to
1911d21
Compare
haraldh
approved these changes
Oct 9, 2020
|
@bors r+ |
|
📌 Commit b6bedc8 has been approved by |
bors
added
S-waiting-on-bors
|
@bors rollup |
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
Oct 10, 2020
…t, r=Amanieu fix __rust_alloc_error_handler comment `__rust_alloc_error_handler` was added in the same `extern` block as the allocator functions, but the comment there was not actually correct for `__rust_alloc_error_handler`. So move it down to the rest of the default allocator handling with a fixed comment. At least the comment reflects my understanding of what happens, please check carefully. :) r? @Amanieu Cc @haraldh
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 10, 2020
Rollup of 10 pull requests Successful merges: - rust-lang#77195 (Link to documentation-specific guidelines.) - rust-lang#77629 (Cleanup of `eat_while()` in lexer) - rust-lang#77709 (Link Vec leak doc to Box) - rust-lang#77738 (fix __rust_alloc_error_handler comment) - rust-lang#77748 (Dead code cleanup in windows-gnu std) - rust-lang#77754 (Add TraitDef::find_map_relevant_impl) - rust-lang#77766 (Clarify the debug-related values should take boolean) - rust-lang#77777 (doc: disambiguate stat in MetadataExt::as_raw_stat) - rust-lang#77782 (Fix typo in error code description) - rust-lang#77787 (Update `changelog-seen` in config.toml.example) Failed merges: r? `@ghost`
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.
__rust_alloc_error_handlerwas added in the sameexternblock as the allocator functions, but the comment there was not actually correct for__rust_alloc_error_handler. So move it down to the rest of the default allocator handling with a fixed comment. At least the comment reflects my understanding of what happens, please check carefully. :)r? @Amanieu Cc @haraldh