interpret: better error when we ran out of memory #126583
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
rustbot
added
S-waiting-on-review
|
Some changes occurred to the CTFE / Miri engine cc @rust-lang/miri |
RalfJung
commented
Jun 17, 2024
| @@ -52,7 +52,7 @@ impl AllocBytes for Box<[u8]> { | |||
| } | |||
|
|
|||
| fn zeroed(size: Size, _align: Align) -> Option<Self> { | |||
| let bytes = Box::<[u8]>::try_new_zeroed_slice(size.bytes_usize()).ok()?; | |||
| let bytes = Box::<[u8]>::try_new_zeroed_slice(size.bytes().try_into().ok()?).ok()?; | |||
There was a problem hiding this comment.
In case size does not fit into a usize (which is totally possible when building for a 64bit target on a 32bit host), this avoids another ICE.
|
Neat. @bors r+ |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 18, 2024
…llaumeGomez Rollup of 5 pull requests Successful merges: - rust-lang#125988 (Migrate `run-make/used` to `rmake.rs`) - rust-lang#126500 (Migrate `error-found-staticlib-instead-crate`, `output-filename-conflicts-with-directory`, `output-filename-overwrites-input`, `native-link-modifier-verbatim-rustc` and `native-link-verbatim-linker` `run-make` tests to `rmake.rs` format) - rust-lang#126583 (interpret: better error when we ran out of memory) - rust-lang#126587 (coverage: Add debugging flag `-Zcoverage-options=no-mir-spans`) - rust-lang#126621 (More thorough status-quo tests for `#[coverage(..)]`) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 18, 2024
Rollup merge of rust-lang#126583 - RalfJung:interpret-oom, r=saethlin interpret: better error when we ran out of memory
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.
No description provided.