Undo workaround for #2633 since it is fixed.

This reverts commit a14df270dc.

Conflicts:

	src/rustc/middle/trans/base.rs
This commit is contained in:
Niko Matsakis 2012-06-17 16:37:49 -07:00
parent 982e1166b2
commit b0e66a6f3b

View File

@ -1424,11 +1424,7 @@ fn copy_val_no_check(bcx: block, action: copy_action, dst: ValueRef,
// FIXME: We always zero out the source. Ideally we would detect the
// case where a variable is always deinitialized by block exit and thus
// doesn't need to be dropped. (Issue #839)
// n.b. + argument mode on cx is a workaround for #2633. Note that cx isn't
// passed by value by default because currently, a newtype-like enum whose
// representation is a box isn't considered to be boxed (and thus, not
// considered immediate).
fn move_val(+cx: block, action: copy_action, dst: ValueRef,
fn move_val(cx: block, action: copy_action, dst: ValueRef,
src: lval_result, t: ty::t) -> block {
let _icx = cx.insn_ctxt("move_val");
let mut src_val = src.val;