Skip to content

Commit

Permalink
Undo workaround for #2633 since it is fixed.
Browse files Browse the repository at this point in the history
This reverts commit a14df27.

Conflicts:

	src/rustc/middle/trans/base.rs
  • Loading branch information
nikomatsakis committed Jun 17, 2012
1 parent 982e116 commit b0e66a6
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions src/rustc/middle/trans/base.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit b0e66a6

Please sign in to comment.