Rollup of 4 pull requests #68384
Closed
Rollup of 4 pull requests #68384
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
This PR complements rust-lang#68253
The `layout` for the returned allocation of a `realloc` is only implicitly specified. This change makes it explicit.
Fix #[track_caller] and function pointers Starting with failing tests, fix the miscompilation and ICE caused by `ReifyShim` bug. Fixes rust-lang#68178.
AArch64 bare-metal targets: Build rust-std This PR complements rust-lang#68253
Add `riscv64gc-unknown-linux-gnu` into target list in build-manifest Missed in rust-lang#68037 r? @alexcrichton
Added minor clarification to specification of GlobalAlloc::realloc.
The specification of `realloc` is slightly unclear:
```
/// * `layout` must be the same layout that was used
/// to allocate that block of memory,
```
https://github.com/rust-lang/rust/blob/master/src/libcore/alloc.rs#L541-L542
In the case of an `alloc` or `alloc_zeroed` this is fairly evidently the `layout` parameter passed into the original call. In the case of a `realloc`, this I assume is `layout` modified to contain `new_size`. However, I could not find this case specified in the documentation. Thus technically in a sequence of calls to `realloc`, it would be valid to provide the second call to `realloc` the same `layout` as the first call to `realloc`, which is almost certainly not going to be handled correctly.
This PR attempts to clarify the specification.
|
@bors r+ p=4 rollup=never |
|
📌 Commit 6b214b1 has been approved by |
bors
added
the
S-waiting-on-bors
|
⌛ Testing commit 6b214b1 with merge 5f73040c05f3c7965702e92141c1afd7f2ebddfe... |
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
|
💔 Test failed - checks-azure |
bors
added
S-waiting-on-review
|
Commented on the PR that seems to be the cause, closing. |
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.
Successful merges:
riscv64gc-unknown-linux-gnuinto target list in build-manifest #68339 (Addriscv64gc-unknown-linux-gnuinto target list in build-manifest)Failed merges:
r? @ghost