Skip to content

rendering interpreter OOM as OOM instead of ICE #153564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rust-bors merged 1 commit into from
Mar 8, 2026
Merged

rendering interpreter OOM as OOM instead of ICE #153564

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions compiler/rustc_middle/src/mir/interpret/allocation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
mod init_mask;
mod provenance_map;

use std::alloc::{self, Layout};
use std::borrow::Cow;
use std::hash::Hash;
use std::ops::{Deref, DerefMut, Range};
Expand Down Expand Up @@ -434,7 +435,7 @@ impl<Prov: Provenance, Bytes: AllocBytes> Allocation<Prov, (), Bytes> {
// available to the compiler can change between runs. Normally queries are always
// deterministic. However, we can be non-deterministic here because all uses of const
// evaluation (including ConstProp!) will make compilation fail (via hard error
// or ICE) upon encountering a `MemoryExhausted` error.
// or OOM) upon encountering a `MemoryExhausted` error.
let bytes = Bytes::zeroed(size, align, params).ok_or_else(fail)?;

Ok(Allocation {
Expand Down Expand Up @@ -468,7 +469,7 @@ impl<Prov: Provenance, Bytes: AllocBytes> Allocation<Prov, (), Bytes> {
.into()
}

/// Try to create an Allocation of `size` bytes, panics if there is not enough memory
/// Try to create an Allocation of `size` bytes. Aborts if there is not enough memory
/// available to the compiler to do so.
///
/// Example use case: To obtain an Allocation filled with specific data,
Expand All @@ -480,10 +481,15 @@ impl<Prov: Provenance, Bytes: AllocBytes> Allocation<Prov, (), Bytes> {
params: <Bytes as AllocBytes>::AllocParams,
) -> Self {
match Self::new_inner(size, align, init, params, || {
panic!(
"interpreter ran out of memory: cannot create allocation of {} bytes",
size.bytes()
);
// `size` may actually be bigger than isize::MAX since it is a *target* size.
// Clamp it to isize::MAX to still give a somewhat reasonable error message.
alloc::handle_alloc_error(
Layout::from_size_align(
size.bytes().min(isize::MAX as u64) as usize,
align.bytes_usize(),
)
.unwrap(),
)
}) {
Ok(x) => x,
Err(x) => x,
Expand Down
Loading