From faa52d1cdaa8806201d56484df0c45bf550bf565 Mon Sep 17 00:00:00 2001 From: Dylan MacKenzie Date: Fri, 13 Dec 2019 10:44:38 -0800 Subject: [PATCH] Correctly mark things as `min_const_fn` --- src/librustc_mir/transform/qualify_min_const_fn.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/librustc_mir/transform/qualify_min_const_fn.rs b/src/librustc_mir/transform/qualify_min_const_fn.rs index 7d0abb5d463b..e2530795749a 100644 --- a/src/librustc_mir/transform/qualify_min_const_fn.rs +++ b/src/librustc_mir/transform/qualify_min_const_fn.rs @@ -390,10 +390,12 @@ fn check_terminator( cleanup: _, } => check_operand(tcx, cond, span, def_id, body), - TerminatorKind::FalseUnwind { .. } if !tcx.features().const_loop => { - Err((span, "loops are not allowed in const fn".into())) - }, + | TerminatorKind::FalseUnwind { .. } + if feature_allowed(tcx, def_id, sym::const_loop) + => Ok(()), - TerminatorKind::FalseUnwind { .. } => Ok(()), + TerminatorKind::FalseUnwind { .. } => { + Err((span, "loops are not allowed in const fn".into())) + } } }