From ed4885359a42354fee8229760c845bf534266427 Mon Sep 17 00:00:00 2001
From: Bastian Kauschke <bastian_kauschke@hotmail.de>
Date: Sun, 22 Mar 2020 11:53:13 +0100
Subject: [PATCH] simplify eval_mir_constant

---
 src/librustc_codegen_ssa/mir/constant.rs | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/librustc_codegen_ssa/mir/constant.rs b/src/librustc_codegen_ssa/mir/constant.rs
index 0fcd11d81001..74a9646a0c0a 100644
--- a/src/librustc_codegen_ssa/mir/constant.rs
+++ b/src/librustc_codegen_ssa/mir/constant.rs
@@ -40,17 +40,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
         &mut self,
         constant: &mir::Constant<'tcx>,
     ) -> Result<ConstValue<'tcx>, ErrorHandled> {
-        let const_ = match constant.literal.val {
-            ty::ConstKind::Unevaluated(def_id, substs, promoted) => {
-                let substs = self.monomorphize(&substs);
-                ty::ConstKind::Unevaluated(def_id, substs, promoted)
-            }
-            ty::ConstKind::Value(value) => ty::ConstKind::Value(value),
-            ty::ConstKind::Param(_) => self.monomorphize(&constant.literal).val,
-            _ => span_bug!(constant.span, "encountered bad Const in codegen: {:?}", constant),
-        };
-
-        match const_ {
+        match self.monomorphize(&constant.literal).val {
             ty::ConstKind::Unevaluated(def_id, substs, promoted) => self
                 .cx
                 .tcx()
@@ -65,10 +55,10 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
                     err
                 }),
             ty::ConstKind::Value(value) => Ok(value),
-            _ => span_bug!(
+            err => span_bug!(
                 constant.span,
                 "encountered bad ConstKind after monomorphizing: {:?}",
-                const_
+                err
             ),
         }
     }