diff --git a/src/librustc_mir/const_eval.rs b/src/librustc_mir/const_eval.rs index 284a8f40e1f..3ad7b00a665 100644 --- a/src/librustc_mir/const_eval.rs +++ b/src/librustc_mir/const_eval.rs @@ -24,7 +24,7 @@ PlaceTy, MPlaceTy, OpTy, ImmTy, Immediate, Scalar, RawConst, ConstValue, InterpResult, InterpErrorInfo, InterpError, GlobalId, InterpretCx, StackPopCleanup, - Allocation, AllocId, MemoryKind, + Allocation, AllocId, MemoryKind, Memory, snapshot, RefTracking, intern_const_alloc_recursive, }; @@ -410,7 +410,7 @@ fn tag_allocation<'b>( _id: AllocId, alloc: Cow<'b, Allocation>, _kind: Option>, - _memory_extra: &(), + _memory: &Memory<'mir, 'tcx, Self>, ) -> (Cow<'b, Allocation>, Self::PointerTag) { // We do not use a tag so we can just cheaply forward the allocation (alloc, ()) @@ -419,7 +419,7 @@ fn tag_allocation<'b>( #[inline(always)] fn tag_static_base_pointer( _id: AllocId, - _memory_extra: &(), + _memory: &Memory<'mir, 'tcx, Self>, ) -> Self::PointerTag { () } diff --git a/src/librustc_mir/interpret/machine.rs b/src/librustc_mir/interpret/machine.rs index 2581c134b26..4eb95f20d93 100644 --- a/src/librustc_mir/interpret/machine.rs +++ b/src/librustc_mir/interpret/machine.rs @@ -11,8 +11,7 @@ use super::{ Allocation, AllocId, InterpResult, Scalar, AllocationExtra, - InterpretCx, PlaceTy, OpTy, ImmTy, MemoryKind, Pointer, - InterpErrorInfo, InterpError + InterpretCx, PlaceTy, OpTy, ImmTy, MemoryKind, Pointer, Memory }; /// Whether this kind of memory is allowed to leak @@ -178,7 +177,7 @@ fn tag_allocation<'b>( id: AllocId, alloc: Cow<'b, Allocation>, kind: Option>, - memory_extra: &Self::MemoryExtra, + memory: &Memory<'mir, 'tcx, Self>, ) -> (Cow<'b, Allocation>, Self::PointerTag); /// Return the "base" tag for the given static allocation: the one that is used for direct @@ -188,7 +187,7 @@ fn tag_allocation<'b>( /// for cyclic statics! fn tag_static_base_pointer( id: AllocId, - memory_extra: &Self::MemoryExtra, + memory: &Memory<'mir, 'tcx, Self>, ) -> Self::PointerTag; /// Executes a retagging operation @@ -212,19 +211,19 @@ fn stack_pop( fn int_to_ptr( int: u64, - _extra: &Self::MemoryExtra, + _mem: &Memory<'mir, 'tcx, Self>, ) -> InterpResult<'tcx, Pointer> { if int == 0 { - Err(InterpErrorInfo::from(InterpError::InvalidNullPointerUsage)) + err!(InvalidNullPointerUsage) } else { - Err(InterpErrorInfo::from(InterpError::ReadBytesAsPointer)) + err!(ReadBytesAsPointer) } } fn ptr_to_int( _ptr: Pointer, - _extra: &Self::MemoryExtra, + _mem: &Memory<'mir, 'tcx, Self>, ) -> InterpResult<'tcx, u64> { - Err(InterpErrorInfo::from(InterpError::ReadPointerAsBytes)) + err!(ReadPointerAsBytes) } } diff --git a/src/librustc_mir/interpret/memory.rs b/src/librustc_mir/interpret/memory.rs index f2a115f8f35..de035ed779e 100644 --- a/src/librustc_mir/interpret/memory.rs +++ b/src/librustc_mir/interpret/memory.rs @@ -107,7 +107,7 @@ pub fn new(tcx: TyCtxtAt<'tcx>) -> Self { #[inline] pub fn tag_static_base_pointer(&self, ptr: Pointer) -> Pointer { - ptr.with_tag(M::tag_static_base_pointer(ptr.alloc_id, &self.extra)) + ptr.with_tag(M::tag_static_base_pointer(ptr.alloc_id, &self)) } pub fn create_fn_alloc(&mut self, instance: Instance<'tcx>) -> Pointer { @@ -140,7 +140,7 @@ pub fn allocate_with( kind: MemoryKind, ) -> Pointer { let id = self.tcx.alloc_map.lock().reserve(); - let (alloc, tag) = M::tag_allocation(id, Cow::Owned(alloc), Some(kind), &self.extra); + let (alloc, tag) = M::tag_allocation(id, Cow::Owned(alloc), Some(kind), &self); self.alloc_map.insert(id, (kind, alloc.into_owned())); Pointer::from(id).with_tag(tag) } @@ -327,7 +327,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> Memory<'mir, 'tcx, M> { fn get_static_alloc( id: AllocId, tcx: TyCtxtAt<'tcx>, - memory_extra: &M::MemoryExtra, + memory: &Memory<'mir, 'tcx, M>, ) -> InterpResult<'tcx, Cow<'tcx, Allocation>> { let alloc = tcx.alloc_map.lock().get(id); let alloc = match alloc { @@ -374,7 +374,7 @@ fn get_static_alloc( id, // always use the ID we got as input, not the "hidden" one. alloc, M::STATIC_KIND.map(MemoryKind::Machine), - memory_extra + memory ).0) } @@ -387,7 +387,7 @@ pub fn get( // `get_static_alloc` that we can actually use directly without inserting anything anywhere. // So the error type is `InterpResult<'tcx, &Allocation>`. let a = self.alloc_map.get_or(id, || { - let alloc = Self::get_static_alloc(id, self.tcx, &self.extra).map_err(Err)?; + let alloc = Self::get_static_alloc(id, self.tcx, &self).map_err(Err)?; match alloc { Cow::Borrowed(alloc) => { // We got a ref, cheaply return that as an "error" so that the @@ -416,11 +416,11 @@ pub fn get_mut( id: AllocId, ) -> InterpResult<'tcx, &mut Allocation> { let tcx = self.tcx; - let memory_extra = &self.extra; + let alloc = Self::get_static_alloc(id, tcx, &self); let a = self.alloc_map.get_mut_or(id, || { // Need to make a copy, even if `get_static_alloc` is able // to give us a cheap reference. - let alloc = Self::get_static_alloc(id, tcx, memory_extra)?; + let alloc = alloc?; if alloc.mutability == Mutability::Immutable { return err!(ModifiedConstantMemory); } @@ -843,7 +843,7 @@ pub fn force_ptr( ) -> InterpResult<'tcx, Pointer> { match scalar { Scalar::Ptr(ptr) => Ok(ptr), - _ => M::int_to_ptr(scalar.to_usize(self)?, &self.extra) + _ => M::int_to_ptr(scalar.to_usize(self)?, self) } } @@ -854,7 +854,7 @@ pub fn force_bits( ) -> InterpResult<'tcx, u128> { match scalar.to_bits_or_ptr(size, self) { Ok(bits) => Ok(bits), - Err(ptr) => Ok(M::ptr_to_int(ptr, &self.extra)? as u128) + Err(ptr) => Ok(M::ptr_to_int(ptr, self)? as u128) } } }