From fe96f8235ca4929652950d62341d3de83527de71 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Mon, 8 Oct 2018 14:34:27 +0200
Subject: [PATCH] validity: check dynamic size, not static

also less verbose logging
---
 src/librustc_mir/interpret/validity.rs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/librustc_mir/interpret/validity.rs b/src/librustc_mir/interpret/validity.rs
index 3be710ef398..f481238bd5b 100644
--- a/src/librustc_mir/interpret/validity.rs
+++ b/src/librustc_mir/interpret/validity.rs
@@ -148,9 +148,6 @@ impl<'a, 'mir, 'tcx, M: Machine<'a, 'mir, 'tcx>> EvalContext<'a, 'mir, 'tcx, M>
         ref_tracking: Option<&mut RefTracking<'tcx>>,
         const_mode: bool,
     ) -> EvalResult<'tcx> {
-        trace!("validate scalar by type: {:#?}, {:#?}, {}",
-            *value, value.layout.size, value.layout.ty);
-
         // Go over all the primitive types
         let ty = value.layout.ty;
         match ty.sty {
@@ -225,7 +222,7 @@ impl<'a, 'mir, 'tcx, M: Machine<'a, 'mir, 'tcx>> EvalContext<'a, 'mir, 'tcx, M>
                         }
                     }
                     // non-ZST also have to be dereferencable
-                    if !place.layout.is_zst() {
+                    if size != Size::ZERO {
                         let ptr = try_validation!(place.ptr.to_ptr(),
                             "integer pointer in non-ZST reference", path);
                         if const_mode {
@@ -280,7 +277,6 @@ impl<'a, 'mir, 'tcx, M: Machine<'a, 'mir, 'tcx>> EvalContext<'a, 'mir, 'tcx, M>
         path: &Vec<PathElem>,
         layout: &layout::Scalar,
     ) -> EvalResult<'tcx> {
-        trace!("validate scalar by layout: {:#?}, {:#?}, {:#?}", value, size, layout);
         let (lo, hi) = layout.valid_range.clone().into_inner();
         let max_hi = u128::max_value() >> (128 - size.bits()); // as big as the size fits
         assert!(hi <= max_hi);
@@ -372,7 +368,7 @@ impl<'a, 'mir, 'tcx, M: Machine<'a, 'mir, 'tcx>> EvalContext<'a, 'mir, 'tcx, M>
         mut ref_tracking: Option<&mut RefTracking<'tcx>>,
         const_mode: bool,
     ) -> EvalResult<'tcx> {
-        trace!("validate_operand: {:?}, {:#?}", *dest, dest.layout);
+        trace!("validate_operand: {:?}, {:?}", *dest, dest.layout.ty);
 
         // If this is a multi-variant layout, we have find the right one and proceed with that.
         // (No good reasoning to make this recursion, but it is equivalent to that.)