user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Expose encapsulated undef mask as immutable

Browse source
This commit is contained in:
Andreas Molzer 2019-08-14 02:26:18 +02:00
parent d8c5bc7ec6
commit 7b941e368f
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/librustc/mir/interpret/allocation.rs
View file

@ -143,6 +143,11 @@ impl<Tag, Extra> Allocation<Tag, Extra> {
pub fn inspect_with_undef_and_ptr_outside_interpreter(&self, range: Range<usize>) -> &[u8] {
&self.bytes[range]
}
/// View the undef mask.
pub fn undef_mask(&self) -> &UndefMask {
&self.undef_mask
}
}
impl<'tcx> rustc_serialize::UseSpecializedDecodable for &'tcx Allocation {}

2
src/librustc_mir/interpret/memory.rs
View file

@ -653,7 +653,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> Memory<'mir, 'tcx, M> {
}
relocations.push((i, target_id));
}
if alloc.undef_mask.is_range_defined(i, i + Size::from_bytes(1)).is_ok() {
if alloc.undef_mask().is_range_defined(i, i + Size::from_bytes(1)).is_ok() {
// this `as usize` is fine, since `i` came from a `usize`
let i = i.bytes() as usize;