bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

remove some now-unnecessary parameters from check_bytes

Browse source
This commit is contained in:
Ralf Jung 2022-07-26 21:49:34 -04:00
parent da13935ecc
commit 2e52fe01cf
3 changed files with 7 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_const_eval/src/interpret/memory.rs
View file

@ -962,15 +962,10 @@ impl<'tcx, 'a, Prov: Provenance, Extra> AllocRef<'a, 'tcx, Prov, Extra> {
}
/// `range` is relative to this allocation reference, not the base of the allocation.
pub fn check_bytes(
&self,
range: AllocRange,
allow_uninit: bool,
allow_ptr: bool,
) -> InterpResult<'tcx> {
pub fn check_bytes(&self, range: AllocRange) -> InterpResult<'tcx> {
Ok(self
.alloc
.check_bytes(&self.tcx, self.range.subrange(range), allow_uninit, allow_ptr)
.check_bytes(&self.tcx, self.range.subrange(range))
.map_err(|e| e.to_interp_error(self.alloc_id))?)
}

6
compiler/rustc_const_eval/src/interpret/validity.rs
View file

@ -893,11 +893,7 @@ impl<'rt, 'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> ValueVisitor<'mir, 'tcx, M>
// We also accept uninit, for consistency with the slow path.
let alloc = self.ecx.get_ptr_alloc(mplace.ptr, size, mplace.align)?.expect("we already excluded size 0");
match alloc.check_bytes(
alloc_range(Size::ZERO, size),
/*allow_uninit*/ false,
/*allow_ptr*/ false,
) {
match alloc.check_bytes(alloc_range(Size::ZERO, size)) {
// In the happy case, we needn't check anything else.
Ok(()) => {}
// Some error happened, try to provide a more detailed description.