From 9cc28d454157dce3885980012dd12e592ce74cc2 Mon Sep 17 00:00:00 2001 From: Christian Poveda Date: Thu, 20 Jun 2019 14:07:34 -0500 Subject: [PATCH 1/2] Replace MemoryExtra by Memory in intptrcast methods --- src/librustc_mir/interpret/machine.rs | 13 ++++++------- src/librustc_mir/interpret/memory.rs | 4 ++-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/librustc_mir/interpret/machine.rs b/src/librustc_mir/interpret/machine.rs index 2581c134b2662..f06c0314919aa 100644 --- a/src/librustc_mir/interpret/machine.rs +++ b/src/librustc_mir/interpret/machine.rs @@ -11,8 +11,7 @@ use rustc::ty::{self, query::TyCtxtAt}; 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 @@ -212,19 +211,19 @@ pub trait Machine<'mir, 'tcx>: Sized { 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 a0a34df3a5ea4..1351d154df7c0 100644 --- a/src/librustc_mir/interpret/memory.rs +++ b/src/librustc_mir/interpret/memory.rs @@ -881,7 +881,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> Memory<'mir, 'tcx, M> { ) -> 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) } } @@ -892,7 +892,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> Memory<'mir, 'tcx, M> { ) -> 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) } } } From 752a1a46685412202153c53ae320957cb48c751b Mon Sep 17 00:00:00 2001 From: Christian Poveda Date: Thu, 20 Jun 2019 16:52:17 -0500 Subject: [PATCH 2/2] Updated tag methods for consistency --- src/librustc_mir/const_eval.rs | 6 +++--- src/librustc_mir/interpret/machine.rs | 4 ++-- src/librustc_mir/interpret/memory.rs | 14 +++++++------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/librustc_mir/const_eval.rs b/src/librustc_mir/const_eval.rs index 7d05e7be26eb9..46c16e9ceae0a 100644 --- a/src/librustc_mir/const_eval.rs +++ b/src/librustc_mir/const_eval.rs @@ -25,7 +25,7 @@ use crate::interpret::{self, PlaceTy, MPlaceTy, MemPlace, OpTy, ImmTy, Immediate, Scalar, RawConst, ConstValue, InterpResult, InterpErrorInfo, InterpError, GlobalId, InterpretCx, StackPopCleanup, - Allocation, AllocId, MemoryKind, + Allocation, AllocId, MemoryKind, Memory, snapshot, RefTracking, }; @@ -404,7 +404,7 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for CompileTimeInterpreter<'mir, _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, ()) @@ -413,7 +413,7 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for CompileTimeInterpreter<'mir, #[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 f06c0314919aa..4eb95f20d9354 100644 --- a/src/librustc_mir/interpret/machine.rs +++ b/src/librustc_mir/interpret/machine.rs @@ -177,7 +177,7 @@ pub trait Machine<'mir, 'tcx>: Sized { 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 @@ -187,7 +187,7 @@ pub trait Machine<'mir, 'tcx>: Sized { /// 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 diff --git a/src/librustc_mir/interpret/memory.rs b/src/librustc_mir/interpret/memory.rs index 1351d154df7c0..b431166a91618 100644 --- a/src/librustc_mir/interpret/memory.rs +++ b/src/librustc_mir/interpret/memory.rs @@ -105,7 +105,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> Memory<'mir, 'tcx, M> { #[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 { @@ -138,7 +138,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> Memory<'mir, 'tcx, M> { 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) } @@ -325,7 +325,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 { @@ -372,7 +372,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> Memory<'mir, 'tcx, M> { id, // always use the ID we got as input, not the "hidden" one. alloc, M::STATIC_KIND.map(MemoryKind::Machine), - memory_extra + memory ).0) } @@ -385,7 +385,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> Memory<'mir, 'tcx, M> { // `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 @@ -414,11 +414,11 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> Memory<'mir, 'tcx, M> { 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); }