Generator assertions are unconditionally triggered

1 files changed, 6 insertions, 4 deletions

diff --git a/src/librustc_mir/transform/const_prop.rs b/src/librustc_mir/transform/const_prop.rs
index 1b64178477e..565e5de85c1 100644
--- a/src/librustc_mir/transform/const_prop.rs
+++ b/src/librustc_mir/transform/const_prop.rs
@@ -404,10 +404,12 @@ impl<'b, 'a, 'tcx> Visitor<'tcx> for ConstPropagator<'b, 'a, 'tcx> {
                     );
                     use rustc::mir::AssertMessage::*;
                     match msg {
-                        GeneratorResumedAfterReturn =>
-                            lint.span_label(span, "generator resumed after completion"),
-                        GeneratorResumedAfterPanic =>
-                            lint.span_label(span, "generator resumed after panicking"),
+                        // Need proper const propagator for these
+                        GeneratorResumedAfterReturn |
+                        GeneratorResumedAfterPanic => {
+                            lint.cancel();
+                            return;
+                        },
                         Math(ref err) => lint.span_label(span, err.description()),
                         BoundsCheck { ref len, ref index } => {
                             let len = self.eval_operand(len).expect("len must be const");