bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

interpret: more debug logging for read_scalar and write_scalar

Browse source
This commit is contained in:
Ralf Jung 2022-04-17 18:07:19 -04:00
parent 5640304c63
commit 989e7479d9
1 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -877,9 +877,17 @@ impl<'tcx, 'a, Tag: Provenance, Extra> AllocRefMut<'a, 'tcx, Tag, Extra> {
range: AllocRange, range: AllocRange,
val: ScalarMaybeUninit<Tag>, val: ScalarMaybeUninit<Tag>,
) -> InterpResult<'tcx> { ) -> InterpResult<'tcx> {
let range = self.range.subrange(range);
debug!(
"write_scalar in {} at {:#x}, size {}: {:?}",
self.alloc_id,
range.start.bytes(),
range.size.bytes(),
val
);
Ok(self Ok(self
.alloc .alloc
.write_scalar(&self.tcx, self.range.subrange(range), val) .write_scalar(&self.tcx, range, val)
.map_err(|e| e.to_interp_error(self.alloc_id))?) .map_err(|e| e.to_interp_error(self.alloc_id))?)
} }
@ -899,10 +907,19 @@ impl<'tcx, 'a, Tag: Provenance, Extra> AllocRefMut<'a, 'tcx, Tag, Extra> {
impl<'tcx, 'a, Tag: Provenance, Extra> AllocRef<'a, 'tcx, Tag, Extra> { impl<'tcx, 'a, Tag: Provenance, Extra> AllocRef<'a, 'tcx, Tag, Extra> {
pub fn read_scalar(&self, range: AllocRange) -> InterpResult<'tcx, ScalarMaybeUninit<Tag>> { pub fn read_scalar(&self, range: AllocRange) -> InterpResult<'tcx, ScalarMaybeUninit<Tag>> {
Ok(self let range = self.range.subrange(range);
let res = self
.alloc .alloc
.read_scalar(&self.tcx, self.range.subrange(range)) .read_scalar(&self.tcx, range)
.map_err(|e| e.to_interp_error(self.alloc_id))?) .map_err(|e| e.to_interp_error(self.alloc_id))?;
debug!(
"read_scalar in {} at {:#x}, size {}: {:?}",
self.alloc_id,
range.start.bytes(),
range.size.bytes(),
res
);
Ok(res)
} }
pub fn read_ptr_sized(&self, offset: Size) -> InterpResult<'tcx, ScalarMaybeUninit<Tag>> { pub fn read_ptr_sized(&self, offset: Size) -> InterpResult<'tcx, ScalarMaybeUninit<Tag>> {