Forward some function calls of Memory to Allocation

oli-obk · oli-obk · commit 9614f348d184 · 2018-10-31T10:38:17.000+01:00
diff --git a/src/librustc/mir/interpret/allocation.rs b/src/librustc/mir/interpret/allocation.rs
@@ -56,7 +56,7 @@ pub struct Allocation<Tag=(),Extra=()> {
     pub extra: Extra,
 }
 
-pub trait AllocationExtra<Tag> {
+pub trait AllocationExtra<Tag>: ::std::fmt::Debug + Default + Clone {
     /// Hook for performing extra checks on a memory access.
     ///
     /// Takes read-only access to the allocation so we can keep all the memory read
@@ -72,6 +72,9 @@ pub trait AllocationExtra<Tag> {
     }
 }
 
+/// For the const evaluator
+impl AllocationExtra<()> for () {}
+
 impl<Tag, Extra: Default> Allocation<Tag, Extra> {
     /// Creates a read-only allocation initialized by the given bytes
     pub fn from_bytes(slice: &[u8], align: Align) -> Self {
@@ -144,7 +147,7 @@ impl<'tcx, Tag: Copy, Extra: AllocationExtra<Tag>> Allocation<Tag, Extra> {
     }
 
     #[inline]
-    fn get_bytes(
+    pub fn get_bytes(
         &self,
         cx: impl HasDataLayout,
         ptr: Pointer<Tag>,
@@ -157,7 +160,7 @@ impl<'tcx, Tag: Copy, Extra: AllocationExtra<Tag>> Allocation<Tag, Extra> {
     /// It is the caller's responsibility to handle undefined and pointer bytes.
     /// However, this still checks that there are no relocations on the *edges*.
     #[inline]
-    fn get_bytes_with_undef_and_ptr(
+    pub fn get_bytes_with_undef_and_ptr(
         &self,
         cx: impl HasDataLayout,
         ptr: Pointer<Tag>,
@@ -169,7 +172,7 @@ impl<'tcx, Tag: Copy, Extra: AllocationExtra<Tag>> Allocation<Tag, Extra> {
 
     /// Just calling this already marks everything as defined and removes relocations,
     /// so be sure to actually put data there!
-    fn get_bytes_mut(
+    pub fn get_bytes_mut(
         &mut self,
         cx: impl HasDataLayout,
         ptr: Pointer<Tag>,
@@ -408,7 +411,7 @@ fn int_align(cx: impl HasDataLayout, size: Size) -> Align {
 /// Relocations
 impl<'tcx, Tag: Copy, Extra> Allocation<Tag, Extra> {
     /// Return all relocations overlapping with the given ptr-offset pair.
-    fn relocations(
+    pub fn relocations(
         &self,
         cx: impl HasDataLayout,
         ptr: Pointer<Tag>,
diff --git a/src/librustc/mir/interpret/mod.rs b/src/librustc/mir/interpret/mod.rs
@@ -26,7 +26,7 @@ pub use self::error::{
 
 pub use self::value::{Scalar, ConstValue};
 
-pub use self::allocation::{Allocation, MemoryAccess};
+pub use self::allocation::{Allocation, MemoryAccess, AllocationExtra};
 
 use std::fmt;
 use mir;
@@ -810,3 +810,8 @@ impl<'tcx, Tag> ScalarMaybeUndef<Tag> {
         self.not_undef()?.to_isize(cx)
     }
 }
+
+impl_stable_hash_for!(enum ::mir::interpret::ScalarMaybeUndef {
+    Scalar(v),
+    Undef
+});
diff --git a/src/librustc_mir/interpret/machine.rs b/src/librustc_mir/interpret/machine.rs
@@ -21,7 +21,7 @@ use rustc::ty::{self, Ty, layout::{Size, TyLayout}, query::TyCtxtAt};
 
 use super::{
     Allocation, AllocId, EvalResult, Scalar,
-    EvalContext, PlaceTy, OpTy, Pointer, MemPlace, MemoryKind,
+    EvalContext, PlaceTy, OpTy, Pointer, MemPlace, MemoryKind, AllocationExtra,
 };
 
 /// Whether this kind of memory is allowed to leak
@@ -78,7 +78,7 @@ pub trait Machine<'a, 'mir, 'tcx>: Sized {
     type PointerTag: ::std::fmt::Debug + Default + Copy + Eq + Hash + 'static;
 
     /// Extra data stored in every allocation.
-    type AllocExtra: ::std::fmt::Debug + Default + Clone;
+    type AllocExtra: AllocationExtra<Self::PointerTag>;
 
     /// Memory's allocation map
     type MemoryMap:
diff --git a/src/librustc_mir/interpret/memory.rs b/src/librustc_mir/interpret/memory.rs
@@ -21,7 +21,7 @@ use std::ptr;
 use std::borrow::Cow;
 
 use rustc::ty::{self, Instance, ParamEnv, query::TyCtxtAt};
-use rustc::ty::layout::{self, Align, TargetDataLayout, Size, HasDataLayout};
+use rustc::ty::layout::{Align, TargetDataLayout, Size, HasDataLayout};
 pub use rustc::mir::interpret::{truncate, write_target_uint, read_target_uint};
 use rustc_data_structures::fx::{FxHashSet, FxHashMap};
 
@@ -30,7 +30,7 @@ use syntax::ast::Mutability;
 use super::{
     Pointer, AllocId, Allocation, ConstValue, GlobalId,
     EvalResult, Scalar, EvalErrorKind, AllocType, PointerArithmetic,
-    Machine, MemoryAccess, AllocMap, MayLeak, ScalarMaybeUndef, ErrorHandled,
+    Machine, MemoryAccess, AllocMap, MayLeak, ScalarMaybeUndef, AllocationExtra, ErrorHandled,
 };
 
 #[derive(Debug, PartialEq, Eq, Copy, Clone, Hash)]
@@ -297,6 +297,17 @@ impl<'a, 'mir, 'tcx, M: Machine<'a, 'mir, 'tcx>> Memory<'a, 'mir, 'tcx, M> {
             })
         }
     }
+
+    /// Convenience forwarding method for `Allocation::check_bounds`.
+    #[inline(always)]
+    pub fn check_bounds(
+        &self,
+        ptr: Pointer<M::PointerTag>,
+        size: Size,
+        access: bool
+    ) -> EvalResult<'tcx> {
+        self.get(ptr.alloc_id)?.check_bounds(self, ptr, size, access)
+    }
 }
 
 /// Allocation accessors
@@ -587,6 +598,7 @@ impl<'a, 'mir, 'tcx, M: Machine<'a, 'mir, 'tcx>> Memory<'a, 'mir, 'tcx, M> {
 impl<'a, 'mir, 'tcx, M> Memory<'a, 'mir, 'tcx, M>
 where
     M: Machine<'a, 'mir, 'tcx, PointerTag=(), AllocExtra=()>,
+    M::AllocExtra: AllocationExtra<()>,
     M::MemoryMap: AllocMap<AllocId, (MemoryKind<M::MemoryKinds>, Allocation)>,
 {
     /// mark an allocation as static and initialized, either mutable or not
@@ -626,3 +638,254 @@ where
         Ok(())
     }
 }
+
+/// Reading and writing
+impl<'a, 'mir, 'tcx, M: Machine<'a, 'mir, 'tcx>> Memory<'a, 'mir, 'tcx, M> {
+    pub fn copy(
+        &mut self,
+        src: Scalar<M::PointerTag>,
+        src_align: Align,
+        dest: Scalar<M::PointerTag>,
+        dest_align: Align,
+        size: Size,
+        nonoverlapping: bool,
+    ) -> EvalResult<'tcx> {
+        self.copy_repeatedly(src, src_align, dest, dest_align, size, 1, nonoverlapping)
+    }
+
+    pub fn copy_repeatedly(
+        &mut self,
+        src: Scalar<M::PointerTag>,
+        src_align: Align,
+        dest: Scalar<M::PointerTag>,
+        dest_align: Align,
+        size: Size,
+        length: u64,
+        nonoverlapping: bool,
+    ) -> EvalResult<'tcx> {
+        if size.bytes() == 0 {
+            // Nothing to do for ZST, other than checking alignment and non-NULLness.
+            self.check_align(src, src_align)?;
+            self.check_align(dest, dest_align)?;
+            return Ok(());
+        }
+        let src = src.to_ptr()?;
+        let dest = dest.to_ptr()?;
+
+        // first copy the relocations to a temporary buffer, because
+        // `get_bytes_mut` will clear the relocations, which is correct,
+        // since we don't want to keep any relocations at the target.
+        // (`get_bytes_with_undef_and_ptr` below checks that there are no
+        // relocations overlapping the edges; those would not be handled correctly).
+        let relocations = {
+            let relocations = self.relocations(src, size)?;
+            let mut new_relocations = Vec::with_capacity(relocations.len() * (length as usize));
+            for i in 0..length {
+                new_relocations.extend(
+                    relocations
+                    .iter()
+                    .map(|&(offset, reloc)| {
+                    (offset + dest.offset - src.offset + (i * size * relocations.len() as u64),
+                     reloc)
+                    })
+                );
+            }
+
+            new_relocations
+        };
+
+        let tcx = self.tcx.tcx;
+
+        // This also checks alignment, and relocation edges on the src.
+        let src_bytes = self
+            .get(src.alloc_id)?
+            .get_bytes_with_undef_and_ptr(tcx, src, size, src_align)?
+            .as_ptr();
+        let dest_bytes = self
+            .get_mut(dest.alloc_id)?
+            .get_bytes_mut(tcx, dest, size * length, dest_align)?
+            .as_mut_ptr();
+
+        // SAFE: The above indexing would have panicked if there weren't at least `size` bytes
+        // behind `src` and `dest`. Also, we use the overlapping-safe `ptr::copy` if `src` and
+        // `dest` could possibly overlap.
+        // The pointers above remain valid even if the `HashMap` table is moved around because they
+        // point into the `Vec` storing the bytes.
+        unsafe {
+            assert_eq!(size.bytes() as usize as u64, size.bytes());
+            if src.alloc_id == dest.alloc_id {
+                if nonoverlapping {
+                    if (src.offset <= dest.offset && src.offset + size > dest.offset) ||
+                        (dest.offset <= src.offset && dest.offset + size > src.offset)
+                    {
+                        return err!(Intrinsic(
+                            "copy_nonoverlapping called on overlapping ranges".to_string(),
+                        ));
+                    }
+                }
+
+                for i in 0..length {
+                    ptr::copy(src_bytes,
+                              dest_bytes.offset((size.bytes() * i) as isize),
+                              size.bytes() as usize);
+                }
+            } else {
+                for i in 0..length {
+                    ptr::copy_nonoverlapping(src_bytes,
+                                             dest_bytes.offset((size.bytes() * i) as isize),
+                                             size.bytes() as usize);
+                }
+            }
+        }
+
+        // copy definedness to the destination
+        self.copy_undef_mask(src, dest, size, length)?;
+        // copy the relocations to the destination
+        self.get_mut(dest.alloc_id)?.relocations.insert_presorted(relocations);
+
+        Ok(())
+    }
+
+    pub fn read_c_str(&self, ptr: Pointer<M::PointerTag>) -> EvalResult<'tcx, &[u8]> {
+        self.get(ptr.alloc_id)?.read_c_str(self, ptr)
+    }
+
+    pub fn check_bytes(
+        &self,
+        ptr: Scalar<M::PointerTag>,
+        size: Size,
+        allow_ptr_and_undef: bool,
+    ) -> EvalResult<'tcx> {
+        // Empty accesses don't need to be valid pointers, but they should still be non-NULL
+        let align = Align::from_bytes(1, 1).unwrap();
+        if size.bytes() == 0 {
+            self.check_align(ptr, align)?;
+            return Ok(());
+        }
+        let ptr = ptr.to_ptr()?;
+        self.get(ptr.alloc_id)?.check_bytes(self, ptr, size, allow_ptr_and_undef)
+    }
+
+    pub fn read_bytes(&self, ptr: Scalar<M::PointerTag>, size: Size) -> EvalResult<'tcx, &[u8]> {
+        // Empty accesses don't need to be valid pointers, but they should still be non-NULL
+        let align = Align::from_bytes(1, 1).unwrap();
+        if size.bytes() == 0 {
+            self.check_align(ptr, align)?;
+            return Ok(&[]);
+        }
+        let ptr = ptr.to_ptr()?;
+        self.get(ptr.alloc_id)?.get_bytes(self, ptr, size, align)
+    }
+
+    pub fn write_bytes(&mut self, ptr: Scalar<M::PointerTag>, src: &[u8]) -> EvalResult<'tcx> {
+        // Empty accesses don't need to be valid pointers, but they should still be non-NULL
+        let align = Align::from_bytes(1, 1).unwrap();
+        if src.is_empty() {
+            self.check_align(ptr, align)?;
+            return Ok(());
+        }
+        let ptr = ptr.to_ptr()?;
+        let tcx = self.tcx.tcx;
+        self.get_mut(ptr.alloc_id)?.write_bytes(tcx, ptr, src)
+    }
+
+    pub fn write_repeat(
+        &mut self,
+        ptr: Scalar<M::PointerTag>,
+        val: u8,
+        count: Size
+    ) -> EvalResult<'tcx> {
+        // Empty accesses don't need to be valid pointers, but they should still be non-NULL
+        let align = Align::from_bytes(1, 1).unwrap();
+        if count.bytes() == 0 {
+            self.check_align(ptr, align)?;
+            return Ok(());
+        }
+        let ptr = ptr.to_ptr()?;
+        let tcx = self.tcx.tcx;
+        self.get_mut(ptr.alloc_id)?.write_repeat(tcx, ptr, val, count)
+    }
+
+    /// Read a *non-ZST* scalar
+    pub fn read_scalar(
+        &self,
+        ptr: Pointer<M::PointerTag>,
+        ptr_align: Align,
+        size: Size
+    ) -> EvalResult<'tcx, ScalarMaybeUndef<M::PointerTag>> {
+        self.get(ptr.alloc_id)?.read_scalar(self, ptr, ptr_align, size)
+    }
+
+    pub fn read_ptr_sized(
+        &self,
+        ptr: Pointer<M::PointerTag>,
+        ptr_align: Align
+    ) -> EvalResult<'tcx, ScalarMaybeUndef<M::PointerTag>> {
+        self.read_scalar(ptr, ptr_align, self.pointer_size())
+    }
+
+    /// Write a *non-ZST* scalar
+    pub fn write_scalar(
+        &mut self,
+        ptr: Pointer<M::PointerTag>,
+        ptr_align: Align,
+        val: ScalarMaybeUndef<M::PointerTag>,
+        type_size: Size,
+    ) -> EvalResult<'tcx> {
+        let tcx = self.tcx.tcx;
+        self.get_mut(ptr.alloc_id)?.write_scalar(tcx, ptr, ptr_align, val, type_size)
+    }
+
+    pub fn write_ptr_sized(
+        &mut self,
+        ptr: Pointer<M::PointerTag>,
+        ptr_align: Align,
+        val: ScalarMaybeUndef<M::PointerTag>
+    ) -> EvalResult<'tcx> {
+        let ptr_size = self.pointer_size();
+        self.write_scalar(ptr, ptr_align, val, ptr_size)
+    }
+}
+
+/// Relocations
+impl<'a, 'mir, 'tcx, M: Machine<'a, 'mir, 'tcx>> Memory<'a, 'mir, 'tcx, M> {
+    /// Return all relocations overlapping with the given ptr-offset pair.
+    fn relocations(
+        &self,
+        ptr: Pointer<M::PointerTag>,
+        size: Size,
+    ) -> EvalResult<'tcx, &[(Size, (M::PointerTag, AllocId))]> {
+        self.get(ptr.alloc_id)?.relocations(self, ptr, size)
+    }
+}
+
+/// Undefined bytes
+impl<'a, 'mir, 'tcx, M: Machine<'a, 'mir, 'tcx>> Memory<'a, 'mir, 'tcx, M> {
+    // FIXME: Add a fast version for the common, nonoverlapping case
+    fn copy_undef_mask(
+        &mut self,
+        src: Pointer<M::PointerTag>,
+        dest: Pointer<M::PointerTag>,
+        size: Size,
+        repeat: u64,
+    ) -> EvalResult<'tcx> {
+        // The bits have to be saved locally before writing to dest in case src and dest overlap.
+        assert_eq!(size.bytes() as usize as u64, size.bytes());
+
+        let undef_mask = self.get(src.alloc_id)?.undef_mask.clone();
+        let dest_allocation = self.get_mut(dest.alloc_id)?;
+
+        for i in 0..size.bytes() {
+            let defined = undef_mask.get(src.offset + Size::from_bytes(i));
+
+            for j in 0..repeat {
+                dest_allocation.undef_mask.set(
+                    dest.offset + Size::from_bytes(i + (size.bytes() * j)),
+                    defined
+                );
+            }
+        }
+
+        Ok(())
+    }
+}
diff --git a/src/librustc_mir/interpret/mod.rs b/src/librustc_mir/interpret/mod.rs
@@ -34,7 +34,7 @@ pub use self::place::{Place, PlaceTy, MemPlace, MPlaceTy};
 
 pub use self::memory::{Memory, MemoryKind};
 
-pub use self::machine::{Machine, AllocMap, MemoryAccess, MayLeak};
+pub use self::machine::{Machine, AllocMap, MayLeak};
 
 pub use self::operand::{ScalarMaybeUndef, Value, ValTy, Operand, OpTy};
 
diff --git a/src/librustc_mir/interpret/place.rs b/src/librustc_mir/interpret/place.rs
diff --git a/src/librustc_mir/interpret/snapshot.rs b/src/librustc_mir/interpret/snapshot.rs

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ pub use self::error::{`
`26`	`26`
`27`	`27`	`pub use self::value::{Scalar, ConstValue};`
`28`	`28`
`29`		`-pub use self::allocation::{Allocation, MemoryAccess};`
	`29`	`+pub use self::allocation::{Allocation, MemoryAccess, AllocationExtra};`
`30`	`30`
`31`	`31`	`use std::fmt;`
`32`	`32`	`use mir;`
`@@ -810,3 +810,8 @@ impl<'tcx, Tag> ScalarMaybeUndef<Tag> {`
`810`	`810`	`self.not_undef()?.to_isize(cx)`
`811`	`811`	`}`
`812`	`812`	`}`
	`813`	`+`
	`814`	`+impl_stable_hash_for!(enum ::mir::interpret::ScalarMaybeUndef {`
	`815`	`+ Scalar(v),`
	`816`	`+ Undef`
	`817`	`+});`