---

yaml
---
r: 38831
b: refs/heads/incoming
c: 45d04f5
h: refs/heads/master
i:
  38829: 930ac32
  38827: 8862b5d
  38823: 2a80686
  38815: c562212
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: 740763fdeff059a8cb67ac6b09eaf9b9e155f661
+refs/heads/incoming: 45d04f5704dbffded1b14c2d4a2c186b91552ebe
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/rustc/middle/trans/expr.rs

@@ -159,7 +159,7 @@ impl Dest : cmp::Eq {
     pure fn ne(other: &Dest) -> bool { !self.eq(other) }
 }
 
-fn drop_and_cancel_clean(dat: Datum, bcx: block) -> block {
+fn drop_and_cancel_clean(bcx: block, dat: Datum) -> block {
     let bcx = dat.drop_val(bcx);
     dat.cancel_clean(bcx);
     return bcx;
@@ -587,7 +587,7 @@ fn trans_rvalue_dps_unadjusted(bcx: block, expr: @ast::expr,
             if bcx.expr_is_lval(a) {
                 let datum = unpack_datum!(bcx, trans_to_datum(bcx, a));
                 return match dest {
-                    Ignore => drop_and_cancel_clean(datum, bcx),
+                    Ignore => drop_and_cancel_clean(bcx, datum),
                     SaveIn(addr) => datum.move_to(bcx, INIT, addr)
                 };
             } else {