From fed3b265635997dc84e8a01311c79726ad1e2ebf Mon Sep 17 00:00:00 2001
From: bjorn3 <bjorn3@users.noreply.github.com>
Date: Sat, 11 Jan 2020 14:20:55 +0100
Subject: [PATCH] Don't panic on reported const eval errors

---
 src/constant.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/constant.rs b/src/constant.rs
index fe3d8e63d42d..686147aa594b 100644
--- a/src/constant.rs
+++ b/src/constant.rs
@@ -85,7 +85,10 @@ pub fn force_eval_const<'tcx>(
     match const_.val {
         ConstKind::Unevaluated(def_id, ref substs) => {
             let substs = fx.monomorphize(substs);
-            fx.tcx.const_eval_resolve(ParamEnv::reveal_all(), def_id, substs, None).unwrap()
+            fx.tcx.const_eval_resolve(ParamEnv::reveal_all(), def_id, substs, None).unwrap_or_else(|_| {
+                fx.tcx.sess.abort_if_errors();
+                unreachable!();
+            })
         }
         _ => fx.monomorphize(&const_),
     }