mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

interpret: better error when we ran out of memory

Browse Source
This commit is contained in:
Ralf Jung 2024-06-17 12:04:52 +02:00
parent f9515fdd5a
commit eefb3ac8af
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compiler/rustc_middle/src/mir/interpret/allocation.rs
View File

@ -52,7 +52,7 @@ impl AllocBytes for Box<[u8]> {
} }
fn zeroed(size: Size, _align: Align) -> Option<Self> { 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()?;
// SAFETY: the box was zero-allocated, which is a valid initial value for Box<[u8]> // SAFETY: the box was zero-allocated, which is a valid initial value for Box<[u8]>
let bytes = unsafe { bytes.assume_init() }; let bytes = unsafe { bytes.assume_init() };
Some(bytes) Some(bytes)
@ -323,7 +323,10 @@ impl<Prov: Provenance, Bytes: AllocBytes> Allocation<Prov, (), Bytes> {
/// first call this function and then call write_scalar to fill in the right data. /// first call this function and then call write_scalar to fill in the right data.
pub fn uninit(size: Size, align: Align) -> Self { pub fn uninit(size: Size, align: Align) -> Self {
match Self::uninit_inner(size, align, || { match Self::uninit_inner(size, align, || {
panic!("Allocation::uninit called with panic_on_fail had allocation failure"); panic!(
"interpreter ran out of memory: cannot create allocation of {} bytes",
size.bytes()
);
}) { }) {
Ok(x) => x, Ok(x) => x,
Err(x) => x, Err(x) => x,