nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-02 21:17:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

use a peekable iterator to check the first chunk

Browse Source
This commit is contained in:
Erik Desjardins 2021-08-25 17:44:27 -04:00
parent c07a2eb5b4
commit adf3b013c8
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -894,6 +894,14 @@ pub enum InitChunk {
} }
impl InitChunk { impl InitChunk {
#[inline]
pub fn is_init(&self) -> bool {
match self {
Self::Init(_) => true,
Self::Uninit(_) => false,
}
}
#[inline] #[inline]
pub fn range(&self) -> Range<Size> { pub fn range(&self) -> Range<Size> {
match self { match self {
@ -1035,7 +1043,7 @@ impl InitMaskCompressed {
/// Transferring the initialization mask to other allocations. /// Transferring the initialization mask to other allocations.
impl<Tag, Extra> Allocation<Tag, Extra> { impl<Tag, Extra> Allocation<Tag, Extra> {
/// Creates a run-length encoding of the initialization mask. /// Creates a run-length encoding of the initialization mask; panics if range is empty.
/// ///
/// This is essentially a more space-efficient version of /// This is essentially a more space-efficient version of
/// `InitMask::range_as_init_chunks(...).collect::<Vec<_>>()`. /// `InitMask::range_as_init_chunks(...).collect::<Vec<_>>()`.
@ -1053,10 +1061,13 @@ impl<Tag, Extra> Allocation<Tag, Extra> {
// where each element toggles the state. // where each element toggles the state.
let mut ranges = smallvec::SmallVec::<[u64; 1]>::new(); let mut ranges = smallvec::SmallVec::<[u64; 1]>::new();
let initial = self.init_mask.get(range.start);
let mut chunks = self.init_mask.range_as_init_chunks(range.start, range.end()).peekable();
let initial = chunks.peek().expect("range should be nonempty").is_init();
// Here we rely on `range_as_init_chunks` to yield alternating init/uninit chunks. // Here we rely on `range_as_init_chunks` to yield alternating init/uninit chunks.
for chunk in self.init_mask.range_as_init_chunks(range.start, range.end()) { for chunk in chunks {
let len = chunk.range().end.bytes() - chunk.range().start.bytes(); let len = chunk.range().end.bytes() - chunk.range().start.bytes();
ranges.push(len); ranges.push(len);
} }