remove redundant return value Ok(()) of clear_relocations()
This commit is contained in:
parent
85bd00fd85
commit
393878b15b
@ -266,7 +266,7 @@ pub fn get_bytes_mut(
|
||||
let range = self.check_bounds(ptr.offset, size);
|
||||
|
||||
self.mark_init(ptr, size, true);
|
||||
self.clear_relocations(cx, ptr, size)?;
|
||||
self.clear_relocations(cx, ptr, size);
|
||||
|
||||
AllocationExtra::memory_written(self, ptr, size)?;
|
||||
|
||||
@ -484,18 +484,13 @@ fn check_relocations(
|
||||
/// uninitialized. This is a somewhat odd "spooky action at a distance",
|
||||
/// but it allows strictly more code to run than if we would just error
|
||||
/// immediately in that case.
|
||||
fn clear_relocations(
|
||||
&mut self,
|
||||
cx: &impl HasDataLayout,
|
||||
ptr: Pointer<Tag>,
|
||||
size: Size,
|
||||
) -> InterpResult<'tcx> {
|
||||
fn clear_relocations(&mut self, cx: &impl HasDataLayout, ptr: Pointer<Tag>, size: Size) {
|
||||
// Find the start and end of the given range and its outermost relocations.
|
||||
let (first, last) = {
|
||||
// Find all relocations overlapping the given range.
|
||||
let relocations = self.get_relocations(cx, ptr, size);
|
||||
if relocations.is_empty() {
|
||||
return Ok(());
|
||||
return;
|
||||
}
|
||||
|
||||
(
|
||||
@ -517,8 +512,6 @@ fn clear_relocations(
|
||||
|
||||
// Forget all the relocations.
|
||||
self.relocations.remove_range(first..last);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Errors if there are relocations overlapping with the edges of the
|
||||
|
Loading…
Reference in New Issue
Block a user