From c1d440070e088c6b239bcf5f9f22dfc6d5b2b639 Mon Sep 17 00:00:00 2001 From: Mazdak Farrokhzad Date: Thu, 29 Aug 2019 09:15:59 +0200 Subject: [PATCH] qualify_consts: fuse prompted_temps. --- src/librustc_mir/transform/qualify_consts.rs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/librustc_mir/transform/qualify_consts.rs b/src/librustc_mir/transform/qualify_consts.rs index 0a9e2a597430..b052d1e9bb46 100644 --- a/src/librustc_mir/transform/qualify_consts.rs +++ b/src/librustc_mir/transform/qualify_consts.rs @@ -1650,16 +1650,10 @@ impl<'tcx> MirPass<'tcx> for QualifyAndPromoteConstants<'tcx> { promote_consts::promote_candidates(def_id, body, tcx, temps, candidates) ); } else { - let const_promoted_temps = match mode { - Mode::Const => Some(tcx.mir_const_qualif(def_id).1), - _ => None, - }; - check_short_circuiting_in_const_local(tcx, body, mode); let promoted_temps = match mode { - // Already computed by `mir_const_qualif`. - Mode::Const => const_promoted_temps.unwrap(), + Mode::Const => tcx.mir_const_qualif(def_id).1, _ => Checker::new(tcx, def_id, body, mode).check_const().1, };