---

yaml
---
r: 5275
b: refs/heads/master
c: 7d69712
h: refs/heads/master
i:
  5273: 8eb6d33
  5271: 3950f0b
v: v3

Author: marijnh

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93d2a4f82a83e05e798eda697e45f66ddb06026b
+refs/heads/master: 7d69712deeca330ae20a5ed6764c73608215a3c5

trunk/src/comp/middle/alias.rs

@@ -176,6 +176,7 @@ fn cant_copy(cx: ctx, b: binding) -> bool {
 
 fn check_call(cx: ctx, f: @ast::expr, args: [@ast::expr]) -> [binding] {
     let fty = ty::type_autoderef(cx.tcx, ty::expr_ty(cx.tcx, f));
+    let ret_ref = ty::ty_fn_ret_style(cx.tcx, fty) == ast::return_ref;
     let arg_ts = ty::ty_fn_args(cx.tcx, fty);
     let mut_roots: [{arg: uint, node: node_id}] = [];
     let bindings = [];
@@ -197,7 +198,7 @@ fn check_call(cx: ctx, f: @ast::expr, args: [@ast::expr]) -> [binding] {
                                  inner_mut(root.ds));
         new_bnd.copied = alt arg_t.mode {
           ast::by_move. { copied }
-          ast::by_ref. { not_copied }
+          ast::by_ref. { ret_ref ? not_allowed : not_copied }
           ast::by_mut_ref. { not_allowed }
         };
         bindings += [new_bnd];