---

yaml
---
r: 13535
b: refs/heads/master
c: 416b3bf
h: refs/heads/master
i:
  13533: 32e4a62
  13531: 3e9362e
  13527: 1ddd0ae
  13519: 3406ca4
  13503: cb66784
v: v3

Author: catamorphism

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: a14df270dc18cd13965e741967eaeac443e20466
+refs/heads/master: 416b3bfea444e67d6c18e3578193376e6ca2b659
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustc/middle/trans/base.rs

@@ -1424,6 +1424,10 @@ 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,
             src: lval_result, t: ty::t) -> block {
     let _icx = cx.insn_ctxt("move_val");