---

yaml
---
r: 32348
b: refs/heads/dist-snap
c: 5573ad7
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: e767011b77c654d0a926e752de216661bc5b2c22
+refs/heads/dist-snap: 5573ad723fc73197889f5890dc9846ba107757d9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/rustc/middle/trans/base.rs

@@ -3112,24 +3112,24 @@ fn trans_arg_expr(cx: block, arg: ty::arg, lldestty: TypeRef, e: @ast::expr,
 
           ast::by_copy | ast::by_move => {
             // Ensure that an owned copy of the value is in memory:
-            let alloc = alloc_ty(bcx, arg.ty);
+            let alloc = alloc_ty(bcx, e_ty);
             let move_out = arg_mode == ast::by_move ||
                 ccx.maps.last_use_map.contains_key(e.id);
             if lv.kind == lv_temporary { revoke_clean(bcx, val); }
-            if lv.kind == lv_owned || !ty::type_is_immediate(arg.ty) {
-                memmove_ty(bcx, alloc, val, arg.ty);
-                if move_out && ty::type_needs_drop(ccx.tcx, arg.ty) {
-                    bcx = zero_mem(bcx, val, arg.ty);
+            if lv.kind == lv_owned || !ty::type_is_immediate(e_ty) {
+                memmove_ty(bcx, alloc, val, e_ty);
+                if move_out && ty::type_needs_drop(ccx.tcx, e_ty) {
+                    bcx = zero_mem(bcx, val, e_ty);
                 }
             } else { Store(bcx, val, alloc); }
             val = alloc;
             if lv.kind != lv_temporary && !move_out {
-                bcx = take_ty(bcx, val, arg.ty);
+                bcx = take_ty(bcx, val, e_ty);
             }
 
             // In the event that failure occurs before the call actually
             // happens, have to cleanup this copy:
-            add_clean_temp_mem(bcx, val, arg.ty);
+            add_clean_temp_mem(bcx, val, e_ty);
             vec::push(temp_cleanups, val);
           }
         }

branches/dist-snap/src/test/run-pass/borrow-by-val-method-receiver.rs

@@ -0,0 +1,13 @@
+trait Foo {
+    fn foo(self);
+}
+
+impl &[int]: Foo {
+    fn foo(self) {}
+}
+
+fn main() {
+    let items = ~[ 3, 5, 1, 2, 4 ];
+    items.foo();
+}
+