Bump rustc for permissive provenance
This commit is contained in:
parent
d76c2c5e1c
commit
f8478df6dc
2 changed files with 22 additions and 6 deletions
|
|
@ -1 +1 @@
|
|||
481db40311cdd241ae4d33f34f2f75732e44d8e8
|
||||
2d691170885b32502b391b8b1a0d54d2419a5653
|
||||
|
|
|
|||
|
|
@ -158,8 +158,8 @@ impl Provenance for Tag {
|
|||
write!(f, "{:?}", tag.sb)
|
||||
}
|
||||
|
||||
fn get_alloc_id(self) -> AllocId {
|
||||
self.alloc_id
|
||||
fn get_alloc_id(self) -> Option<AllocId> {
|
||||
Some(self.alloc_id)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -600,21 +600,37 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for Evaluator<'mir, 'tcx> {
|
|||
}
|
||||
|
||||
#[inline(always)]
|
||||
fn ptr_from_addr(
|
||||
fn ptr_from_addr_cast(
|
||||
ecx: &MiriEvalContext<'mir, 'tcx>,
|
||||
addr: u64,
|
||||
) -> Pointer<Option<Self::PointerTag>> {
|
||||
intptrcast::GlobalStateInner::ptr_from_addr(addr, ecx)
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
fn ptr_from_addr_transmute(
|
||||
ecx: &MiriEvalContext<'mir, 'tcx>,
|
||||
addr: u64,
|
||||
) -> Pointer<Option<Self::PointerTag>> {
|
||||
Self::ptr_from_addr_cast(ecx, addr)
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
fn expose_ptr(
|
||||
_ecx: &mut InterpCx<'mir, 'tcx, Self>,
|
||||
_ptr: Pointer<Self::PointerTag>,
|
||||
) -> InterpResult<'tcx> {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Convert a pointer with provenance into an allocation-offset pair,
|
||||
/// or a `None` with an absolute address if that conversion is not possible.
|
||||
fn ptr_get_alloc(
|
||||
ecx: &MiriEvalContext<'mir, 'tcx>,
|
||||
ptr: Pointer<Self::PointerTag>,
|
||||
) -> (AllocId, Size, Self::TagExtra) {
|
||||
) -> Option<(AllocId, Size, Self::TagExtra)> {
|
||||
let rel = intptrcast::GlobalStateInner::abs_ptr_to_rel(ecx, ptr);
|
||||
(ptr.provenance.alloc_id, rel, ptr.provenance.sb)
|
||||
Some((ptr.provenance.alloc_id, rel, ptr.provenance.sb))
|
||||
}
|
||||
|
||||
#[inline(always)]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue