---

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

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: ff9151fa55e4e81c0cbaa7181eb672b2df6b53f6
+refs/heads/incoming: 62be878ed1715650f080c3b113a85f73e7af0973
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/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" => {