---

yaml
---
r: 28589
b: refs/heads/try
c: 53abb5e
h: refs/heads/master
i:
  28587: a4edf36
v: v3

Author: nikomatsakis

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
-refs/heads/try: 8d4928f7808813de62fefcb89139bfb7382b250b
+refs/heads/try: 53abb5edbd2079fdcc1c2887cf0a89aad75d6ea1
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df

branches/try/src/rustc/middle/ty.rs

@@ -1090,12 +1090,22 @@ pure fn mach_sty(cfg: @session::config, t: t) -> sty {
 }
 
 fn default_arg_mode_for_ty(tcx: ctxt, ty: ty::t) -> ast::rmode {
-    if ty::type_is_immediate(ty) {
+    return if ty::type_is_immediate(ty) {
         ast::by_val
-    } else if tcx.legacy_modes {
+    } else if tcx.legacy_modes || type_is_fn(ty) {
+        //                        ^^^^^^^^^^^^^^
+        // FIXME(#2202) --- We retain by-ref by default to workaround a memory
+        // leak that otherwise results when @fn is upcast to &fn.
         ast::by_ref
     } else {
         ast::by_copy
+    };
+
+    fn type_is_fn(ty: t) -> bool {
+        match get(ty).sty {
+            ty_fn(*) => true,
+            _ => false
+        }
     }
 }