Skip to content

Commit b0e66a6

Browse files
committed
Undo workaround for #2633 since it is fixed.
This reverts commit a14df27. Conflicts: src/rustc/middle/trans/base.rs
1 parent 982e116 commit b0e66a6

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

src/rustc/middle/trans/base.rs

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

0 commit comments

Comments
 (0)