From 4504e23a82a2c4e1d0ef6325541036eb0d5b66f0 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Sat, 21 May 2011 18:00:44 -0400 Subject: [PATCH] rustc: Remove unnecessary pushdown from check_expr in the expr_if case --- src/comp/middle/typeck.rs | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/comp/middle/typeck.rs b/src/comp/middle/typeck.rs index af1a1a066a6f..8da317dc8ba0 100644 --- a/src/comp/middle/typeck.rs +++ b/src/comp/middle/typeck.rs @@ -2134,28 +2134,23 @@ fn check_expr(&@stmt_ctxt scx, &@ast::expr expr) { cond); check_block(scx, thn); - auto thn_t = block_ty(scx.fcx.ccx.tcx, thn); - auto if_t; - alt (elsopt) { + auto if_t = alt (elsopt) { case (some[@ast::expr](?els)) { check_expr(scx, els); + + auto thn_t = block_ty(scx.fcx.ccx.tcx, thn); auto elsopt_t = expr_ty(scx.fcx.ccx.tcx, els); if (!ty::type_is_bot(scx.fcx.ccx.tcx, elsopt_t)) { - Pushdown::pushdown_expr(scx, thn_t, els); - if_t = elsopt_t; + elsopt_t } else { - if_t = thn_t; + thn_t } } case (none[@ast::expr]) { - if_t = ty::mk_nil(scx.fcx.ccx.tcx); + ty::mk_nil(scx.fcx.ccx.tcx) } - } - - if (!ty::type_is_bot(scx.fcx.ccx.tcx, thn_t)) { - Pushdown::pushdown_block(scx, if_t, thn); - } + }; write::ty_only_fixup(scx, a.id, if_t); }