---

yaml
---
r: 23508
b: refs/heads/master
c: 62be878
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: ff9151fa55e4e81c0cbaa7181eb672b2df6b53f6
+refs/heads/master: 62be878ed1715650f080c3b113a85f73e7af0973
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

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

@@ -937,9 +937,12 @@ fn trans_intrinsic(ccx: @crate_ctxt, decl: ValueRef, item: @ast::foreign_item,
                          ty_to_str(ccx.tcx, substs.tys[1]), out_sz));
         }
         if !ty::type_is_nil(substs.tys[1]) {
-            let cast = PointerCast(bcx, get_param(decl, first_real_arg),
-                                   T_ptr(llout_ty));
-            Store(bcx, Load(bcx, cast), fcx.llretptr);
+            // NB: Do not use a Load and Store here. This causes massive code
+            // bloat when reinterpret_cast is used on large structural types.
+            let llretptr = PointerCast(bcx, fcx.llretptr, T_ptr(T_i8()));
+            let llcast = get_param(decl, first_real_arg);
+            let llcast = PointerCast(bcx, llcast, T_ptr(T_i8()));
+            call_memmove(bcx, llretptr, llcast, llsize_of(ccx, lltp_ty));
         }
       }
       ~"addr_of" => {