diff options
| -rw-r--r-- | src/librustc/middle/trans/foreign.rs | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/src/librustc/middle/trans/foreign.rs b/src/librustc/middle/trans/foreign.rs index bdae2220598..9019cd72ff8 100644 --- a/src/librustc/middle/trans/foreign.rs +++ b/src/librustc/middle/trans/foreign.rs @@ -725,24 +725,21 @@ pub fn trans_intrinsic(ccx: @mut CrateContext, } if !ty::type_is_nil(out_type) { - // NB: Do not use a Load and Store here. This causes massive - // code bloat when `transmute` is used on large structural - // types. let lldestptr = fcx.llretptr.get(); - let lldestptr = PointerCast(bcx, lldestptr, Type::i8p()); - let llsrcval = get_param(decl, first_real_arg); - let llsrcptr = if ty::type_is_immediate(ccx.tcx, in_type) { - let llsrcptr = alloca(bcx, llintype, "__llsrcptr"); - Store(bcx, llsrcval, llsrcptr); - llsrcptr + if ty::type_is_immediate(ccx.tcx, in_type) { + let lldestptr = PointerCast(bcx, lldestptr, llintype.ptr_to()); + Store(bcx, llsrcval, lldestptr); } else { - llsrcval + // NB: Do not use a Load and Store here. This causes massive + // code bloat when `transmute` is used on large structural + // types. + let lldestptr = PointerCast(bcx, lldestptr, Type::i8p()); + let llsrcptr = PointerCast(bcx, llsrcval, Type::i8p()); + + let llsize = llsize_of(ccx, llintype); + call_memcpy(bcx, lldestptr, llsrcptr, llsize, 1); }; - let llsrcptr = PointerCast(bcx, llsrcptr, Type::i8p()); - - let llsize = llsize_of(ccx, llintype); - call_memcpy(bcx, lldestptr, llsrcptr, llsize, 1); } } "needs_drop" => { |