---

yaml
---
r: 14553
b: refs/heads/try
c: c3ae72d
h: refs/heads/master
i:
  14551: 3ec6daf
v: v3

Author: marijnh

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 0da1aca498114a1caa608592dd63bebee615755e
+refs/heads/try: c3ae72d60b170e193cb006b7e880404b34984a82
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/comp/middle/kind.rs

@@ -70,7 +70,7 @@ fn with_appropriate_checker(cx: ctx, id: node_id,
 // Check that the free variables used in a shared/sendable closure conform
 // to the copy/move kind bounds. Then recursively check the function body.
 fn check_fn(fk: visit::fn_kind, decl: fn_decl, body: blk, sp: span,
-            id: node_id, cx: ctx, v: visit::vt<ctx>) {
+            fn_id: node_id, cx: ctx, v: visit::vt<ctx>) {
 
     // n.b.: This could be the body of either a fn decl or a fn expr.  In the
     // former case, the prototype will be proto_bare and no check occurs.  In
@@ -82,15 +82,22 @@ fn check_fn(fk: visit::fn_kind, decl: fn_decl, body: blk, sp: span,
     // "future-proof" to do it this way, as check_fn_body() is supposed to be
     // the common flow point for all functions that appear in the AST.
 
-    with_appropriate_checker(cx, id) { |checker|
-        for @{def, span} in *freevars::get_freevars(cx.tcx, id) {
+    with_appropriate_checker(cx, fn_id) { |checker|
+        for @{def, span} in *freevars::get_freevars(cx.tcx, fn_id) {
             let id = ast_util::def_id_of_def(def).node;
+            if checker == check_copy {
+                let last_uses = alt check cx.last_uses.find(fn_id) {
+                  some(last_use::closes_over(vars)) { vars }
+                  none { [] }
+                };
+                if option::is_some(vec::position_elt(last_uses, id)) { cont; }
+            }                    
             let ty = ty::node_id_to_type(cx.tcx, id);
             checker(cx, ty, span);
         }
     }
 
-    visit::visit_fn(fk, decl, body, sp, id, cx, v);
+    visit::visit_fn(fk, decl, body, sp, fn_id, cx, v);
 }
 
 fn check_fn_cap_clause(cx: ctx,