---

yaml
---
r: 127770
b: refs/heads/master
c: 0ad97c0
h: refs/heads/master
v: v3

Author: luqmana

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 5aedcb1e916711bfeb65c26b5c6210a3fb5d72bf
+refs/heads/master: 0ad97c042a1ae41652a0157d0ac148e6e90db6c2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: aa98b25c4f0c10729dff37c699904ad57b8fbda8
 refs/heads/try: d9c23fcbaea89871667272a67ecb8d3a512162f3

trunk/src/librustc/middle/trans/base.rs

@@ -1122,7 +1122,7 @@ pub fn memcpy_ty(bcx: &Block, dst: ValueRef, src: ValueRef, t: ty::t) {
         let llalign = llalign_of_min(ccx, llty);
         call_memcpy(bcx, dst, src, llsz, llalign as u32);
     } else {
-        Store(bcx, Load(bcx, src), dst);
+        store_ty(bcx, Load(bcx, src), dst, t);
     }
 }
 
@@ -1546,7 +1546,7 @@ pub fn build_return_block(fcx: &FunctionContext, ret_cx: &Block, retty: ty::t) {
 
     let retslot = Load(ret_cx, fcx.llretslotptr.get().unwrap());
     let retptr = Value(retslot);
-    let retval = match retptr.get_dominating_store(ret_cx) {
+    match retptr.get_dominating_store(ret_cx) {
         // If there's only a single store to the ret slot, we can directly return
         // the value that was stored and omit the store and the alloca
         Some(s) => {
@@ -1557,21 +1557,28 @@ pub fn build_return_block(fcx: &FunctionContext, ret_cx: &Block, retty: ty::t) {
                 retptr.erase_from_parent();
             }
 
-            if ty::type_is_bool(retty) {
+            let retval = if ty::type_is_bool(retty) {
                 Trunc(ret_cx, retval, Type::i1(fcx.ccx))
             } else {
                 retval
+            };
+
+            if fcx.caller_expects_out_pointer {
+                store_ty(ret_cx, retval, get_param(fcx.llfn, 0), retty);
+                return RetVoid(ret_cx);
+            } else {
+                return Ret(ret_cx, retval);
+            }
+        }
+        // Otherwise, copy the return value to the ret slot
+        None => {
+            if fcx.caller_expects_out_pointer {
+                memcpy_ty(ret_cx, get_param(fcx.llfn, 0), retslot, retty);
+                return RetVoid(ret_cx);
+            } else {
+                return Ret(ret_cx, load_ty(ret_cx, retslot, retty));
             }
         }
-        // Otherwise, load the return value from the ret slot
-        None => load_ty(ret_cx, retslot, retty)
-    };
-
-    if fcx.caller_expects_out_pointer {
-        store_ty(ret_cx, retval, get_param(fcx.llfn, 0), retty);
-        RetVoid(ret_cx);
-    } else {
-        Ret(ret_cx, retval);
     }
 }