mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

replace Vec<u8> with Box<[u8]>

Browse source
This commit is contained in:
The8472 2021-08-05 19:52:08 +02:00
parent 6ed2d870fc
commit 55def120a4
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_middle/src/mir/interpret/allocation.rs
View file

@ -28,7 +28,7 @@ use crate::ty;
pub struct Allocation<Tag = AllocId, Extra = ()> { pub struct Allocation<Tag = AllocId, Extra = ()> {
/// The actual bytes of the allocation. /// The actual bytes of the allocation.
/// Note that the bytes of a pointer represent the offset of the pointer. /// Note that the bytes of a pointer represent the offset of the pointer.
bytes: Vec<u8>, bytes: Box<[u8]>,
/// Maps from byte addresses to extra data for each pointer. /// Maps from byte addresses to extra data for each pointer.
/// Only the first byte of a pointer is inserted into the map; i.e., /// Only the first byte of a pointer is inserted into the map; i.e.,
/// every entry in this map applies to `pointer_size` consecutive bytes starting /// every entry in this map applies to `pointer_size` consecutive bytes starting
@ -112,7 +112,7 @@ impl<Tag> Allocation<Tag> {
align: Align, align: Align,
mutability: Mutability, mutability: Mutability,
) -> Self { ) -> Self {
let bytes = slice.into().into_owned(); let bytes = Box::<[u8]>::from(slice.into());
let size = Size::from_bytes(bytes.len()); let size = Size::from_bytes(bytes.len());
Self { Self {
bytes, bytes,
@ -145,9 +145,8 @@ impl<Tag> Allocation<Tag> {
}); });
InterpError::ResourceExhaustion(ResourceExhaustionInfo::MemoryExhausted) InterpError::ResourceExhaustion(ResourceExhaustionInfo::MemoryExhausted)
})?; })?;
// SAFETY: This turns a Box<[MaybeUninit<u8>]> into a Vec<u8>. This is safe since the box // SAFETY: the box was zero-allocated, which is a valid initial value for Box<[u8]>
// was zero-allocated which is a valid value for u8. let bytes = unsafe { bytes.assume_init() };
let bytes = unsafe { bytes.assume_init().into_vec() };
Ok(Allocation { Ok(Allocation {
bytes, bytes,
relocations: Relocations::new(), relocations: Relocations::new(),