From 23b0c470244e612206486bb51f687ef4f6b6e117 Mon Sep 17 00:00:00 2001
From: Oliver Scherer <github35764891676564198441@oli-obk.de>
Date: Fri, 27 Dec 2019 00:52:12 +0100
Subject: [PATCH] Ensure we don't accidentally turn non-zsts into zsts

---
 src/librustc_mir/const_eval/eval_queries.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/librustc_mir/const_eval/eval_queries.rs b/src/librustc_mir/const_eval/eval_queries.rs
index b0add10dcac4..9fbb6e1a39d9 100644
--- a/src/librustc_mir/const_eval/eval_queries.rs
+++ b/src/librustc_mir/const_eval/eval_queries.rs
@@ -125,6 +125,7 @@ pub(super) fn op_to_const<'tcx>(
         }
         Scalar::Raw { data, .. } => {
             assert_eq!(data, mplace.layout.align.abi.bytes().into());
+            assert!(mplace.layout.is_zst());
             ConstValue::Scalar(Scalar::zst())
         }
     };