Rollup merge of #73339 - jonas-schievink:unbug, r=estebank

Dylan-DPC · web-flow · commit 5bbcdf5f53c4 · 2020-06-16T15:08:37.000+02:00
Don't run generator transform when there's a TyErr Not sure if this might cause any problems later on, but we shouldn't be hitting codegen or const eval for the produced MIR anyways, so it should be fine. cc #72685 (comment)
diff --git a/src/librustc_mir/transform/generator.rs b/src/librustc_mir/transform/generator.rs
@@ -1222,7 +1222,11 @@ impl<'tcx> MirPass<'tcx> for StateTransform {
                     movability == hir::Movability::Movable,
                 )
             }
-            _ => bug!(),
+            _ => {
+                tcx.sess
+                    .delay_span_bug(body.span, &format!("unexpected generator type {}", gen_ty));
+                return;
+            }
         };
 
         // Compute GeneratorState<yield_ty, return_ty>

Original file line number	Diff line number	Diff line change
`@@ -1222,7 +1222,11 @@ impl<'tcx> MirPass<'tcx> for StateTransform {`
`1222`	`1222`	`movability == hir::Movability::Movable,`
`1223`	`1223`	`)`
`1224`	`1224`	`}`
`1225`		`- _ => bug!(),`
	`1225`	`+ _ => {`
	`1226`	`+ tcx.sess`
	`1227`	`+ .delay_span_bug(body.span, &format!("unexpected generator type {}", gen_ty));`
	`1228`	`+ return;`
	`1229`	`+ }`
`1226`	`1230`	`};`
`1227`	`1231`
`1228`	`1232`	`// Compute GeneratorState<yield_ty, return_ty>`