Fix handling of divergent dicriminants

varkor · varkor · commit 4c88be3592ce · 2018-12-11T11:18:55.000Z
diff --git a/src/librustc_mir/build/expr/into.rs b/src/librustc_mir/build/expr/into.rs
@@ -275,7 +275,6 @@ impl<'a, 'gcx, 'tcx> Builder<'a, 'gcx, 'tcx> {
                 exit_block.unit()
             }
             ExprKind::Call { ty, fun, args, from_hir_call } => {
-                let diverges = expr.ty.conservative_is_uninhabited();
                 let intrinsic = match ty.sty {
                     ty::FnDef(def_id, _) => {
                         let f = ty.fn_sig(this.hir.tcx());

Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,6 @@ impl<'a, 'gcx, 'tcx> Builder<'a, 'gcx, 'tcx> {`
`275`	`275`	`exit_block.unit()`
`276`	`276`	`}`
`277`	`277`	`ExprKind::Call { ty, fun, args, from_hir_call } => {`
`278`		`- let diverges = expr.ty.conservative_is_uninhabited();`
`279`	`278`	`let intrinsic = match ty.sty {`
`280`	`279`	`ty::FnDef(def_id, _) => {`
`281`	`280`	`let f = ty.fn_sig(this.hir.tcx());`