error IncorrectAllocationInformation

Author: Dante-Broggi

src/librustc/mir/interpret/error.rs

@@ -4,7 +4,7 @@ use crate::hir;
 use crate::hir::map::definitions::DefPathData;
 use crate::mir;
 use crate::ty::{self, Ty, layout};
-use crate::ty::layout::{Size, Align, LayoutError};
+use crate::ty::layout::{Size, MemoryPosition, Align, LayoutError};
 use crate::ty::query::TyCtxtAt;
 
 use backtrace::Backtrace;
@@ -438,7 +438,7 @@ pub enum UnsupportedOpInfo<'tcx> {
     DeallocatedWrongMemoryKind(String, String),
     ReallocateNonBasePtr,
     DeallocateNonBasePtr,
-    IncorrectAllocationInformation(Size, Size, Align, Align),
+    IncorrectAllocationInformation(MemoryPosition, MemoryPosition),
     HeapAllocZeroBytes,
     HeapAllocNonPowerOfTwoAlignment(u64),
     ReadFromReturnPointer,
@@ -484,10 +484,10 @@ impl fmt::Debug for UnsupportedOpInfo<'tcx> {
                 write!(f, "expected primitive type, got {}", ty),
             PathNotFound(ref path) =>
                 write!(f, "cannot find path {:?}", path),
-            IncorrectAllocationInformation(size, size2, align, align2) =>
+            IncorrectAllocationInformation(expect, got) =>
                 write!(f, "incorrect alloc info: expected size {} and align {}, \
                            got size {} and align {}",
-                    size.bytes(), align.bytes(), size2.bytes(), align2.bytes()),
+                    expect.size.bytes(), expect.align.bytes(), got.size.bytes(), got.align.bytes()),
             InvalidMemoryAccess =>
                 write!(f, "tried to access memory through an invalid pointer"),
             DanglingPointerDeref =>

src/librustc/ty/layout.rs

@@ -2466,6 +2466,11 @@ impl_stable_hash_for!(struct crate::ty::layout::LayoutPositionPref {
     align
 });
 
+impl_stable_hash_for!(struct crate::ty::layout::MemoryPosition {
+    size,
+    align
+});
+
 impl<'tcx> HashStable<StableHashingContext<'tcx>> for Align {
     fn hash_stable(&self, hcx: &mut StableHashingContext<'tcx>, hasher: &mut StableHasher) {
         self.bytes().hash_stable(hcx, hasher);

src/librustc_mir/interpret/memory.rs

@@ -268,10 +268,10 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> Memory<'mir, 'tcx, M> {
                 format!("{:?}", kind),
             ))
         }
-        if let Some(MemoryPosition {size, align}) = old_mem_pos {
-            if size != alloc.size || align != alloc.align {
-                let bytes = alloc.size;
-                throw_unsup!(IncorrectAllocationInformation(size, bytes, align, alloc.align))
+        if let Some(mem_pos) = old_mem_pos {
+            if mem_pos != MemoryPosition::new(alloc.size, alloc.align) {
+                let got_mem_pos = MemoryPosition::new(alloc.size, alloc.align);
+                throw_unsup!(IncorrectAllocationInformation(mem_pos, got_mem_pos))
             }
         }