---

yaml
---
r: 13150
b: refs/heads/master
c: 41b02b7
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 3a2c92b46334d422c438061335f6f76669c8743f
+refs/heads/master: 41b02b7c57092f1da63beec60358061a9579d8c6
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustc/middle/tstate/auxiliary.rs

@@ -224,7 +224,8 @@ type fn_info =
     {constrs: constr_map,
      num_constraints: uint,
      cf: ret_style,
-     used_vars: @mut [node_id]};
+     used_vars: @mut [node_id],
+     ignore: bool};
 
 /* mapping from node ID to typestate annotation */
 type node_ann_table = @mut [mut ts_ann];

trunk/src/rustc/middle/tstate/ck.rs

@@ -116,10 +116,11 @@ fn fn_states(fk: visit::fn_kind, f_decl: ast::fn_decl, f_body: ast::blk,
              sp: span, id: node_id,
              ccx: crate_ctxt, v: visit::vt<crate_ctxt>) {
 
+    visit::visit_fn(fk, f_decl, f_body, sp, id, ccx, v);
+
     // We may not care about typestate for this function if it contains
     // no constrained calls
-    if ccx.fm.contains_key(id) {
-        visit::visit_fn(fk, f_decl, f_body, sp, id, ccx, v);
+    if !ccx.fm.get(id).ignore {
         /* Look up the var-to-bit-num map for this function */
 
         let f_info = ccx.fm.get(id);

trunk/src/rustc/middle/tstate/collect_locals.rs

@@ -69,6 +69,34 @@ fn add_constraint(tcx: ty::ctxt, c: sp_constr, next: uint, tbl: constr_map) ->
     ret next + 1u;
 }
 
+fn contains_constrained_calls(tcx: ty::ctxt, body: blk) -> bool {
+    type cx = @{
+        tcx: ty::ctxt,
+        mut has: bool
+    };
+    let cx = @{
+        tcx: tcx,
+        mut has: false
+    };
+    let vtor = visit::default_visitor::<cx>();
+    let vtor = @{visit_expr: visit_expr with *vtor};
+    visit::visit_block(body, cx, visit::mk_vt(vtor));
+    ret cx.has;
+
+    fn visit_expr(e: @expr, &&cx: cx, v: visit::vt<cx>) {
+        import syntax::print::pprust;
+        #debug("visiting %?", pprust::expr_to_str(e));
+
+        visit::visit_expr(e, cx, v);
+
+        if constraints_expr(cx.tcx, e).is_not_empty() {
+            #debug("has constraints");
+            cx.has = true;
+        } else {
+            #debug("has not constraints");
+        }
+    }
+}
 
 /* builds a table mapping each local var defined in f
    to a bit number in the precondition/postcondition vectors */
@@ -86,24 +114,29 @@ fn mk_fn_info(ccx: crate_ctxt,
     /* now we have to add bit nums for both the constraints
        and the variables... */
 
-    let mut i = 0u, l = vec::len(*cx.cs);
-    while i < l {
-        next = add_constraint(cx.tcx, copy cx.cs[i], next, res_map);
-        i += 1u;
-    }
-    /* if this function has any constraints, instantiate them to the
-       argument names and add them */
-    for f_decl.constraints.each {|c|
-        let sc = ast_constr_to_sp_constr(cx.tcx, f_decl.inputs, c);
-        next = add_constraint(cx.tcx, sc, next, res_map);
+    let ignore = !contains_constrained_calls(ccx.tcx, f_body);
+
+    if !ignore {
+        let mut i = 0u, l = vec::len(*cx.cs);
+        while i < l {
+            next = add_constraint(cx.tcx, copy cx.cs[i], next, res_map);
+            i += 1u;
+        }
+        /* if this function has any constraints, instantiate them to the
+        argument names and add them */
+        for f_decl.constraints.each {|c|
+            let sc = ast_constr_to_sp_constr(cx.tcx, f_decl.inputs, c);
+            next = add_constraint(cx.tcx, sc, next, res_map);
+        }
     }
 
     let v: @mut [node_id] = @mut [];
     let rslt =
         {constrs: res_map,
          num_constraints: next,
          cf: f_decl.cf,
-         used_vars: v};
+         used_vars: v,
+         ignore: ignore};
     ccx.fm.insert(id, rslt);
     #debug("%s has %u constraints", name, num_constraints(rslt));
 }

trunk/src/rustc/middle/tstate/pre_post_conditions.rs

@@ -618,42 +618,13 @@ fn find_pre_post_fn(fcx: fn_ctxt, body: blk) {
     }
 }
 
-fn contains_constrained_calls(tcx: ty::ctxt, body: blk) -> bool {
-    type cx = @{
-        tcx: ty::ctxt,
-        mut has: bool
-    };
-    let cx = @{
-        tcx: tcx,
-        mut has: false
-    };
-    let vtor = visit::default_visitor::<cx>();
-    let vtor = @{visit_expr: visit_expr with *vtor};
-    visit::visit_block(body, cx, visit::mk_vt(vtor));
-    ret cx.has;
-
-    fn visit_expr(e: @expr, &&cx: cx, v: visit::vt<cx>) {
-        import syntax::print::pprust;
-        #debug("visiting %?", pprust::expr_to_str(e));
-
-        visit::visit_expr(e, cx, v);
-
-        if constraints_expr(cx.tcx, e).is_not_empty() {
-            #debug("has constraints");
-            cx.has = true;
-        } else {
-            #debug("has not constraints");
-        }
-    }
-}
-
 fn fn_pre_post(fk: visit::fn_kind, decl: fn_decl, body: blk, sp: span,
                id: node_id,
                ccx: crate_ctxt, v: visit::vt<crate_ctxt>) {
 
-    if contains_constrained_calls(ccx.tcx, body) {
-        visit::visit_fn(fk, decl, body, sp, id, ccx, v);
-        assert (ccx.fm.contains_key(id));
+    visit::visit_fn(fk, decl, body, sp, id, ccx, v);
+    assert (ccx.fm.contains_key(id));
+    if !ccx.fm.get(id).ignore {
         let fcx =
             {enclosing: ccx.fm.get(id),
              id: id,

trunk/src/snapshots.txt

@@ -6,6 +6,14 @@ S 2012-05-30 0c0818b
   macos-x86_64 d562f05c8911e7405b0a9ff5815f49fca69045d3
   macos-i386 4d09cc2a4882d92f125718161e3d7086531748e6
 
+S 2012-05-30 02dde78
+  winnt-i386 b394e3db0639942a9844ce6f78d34239a90127af
+  linux-x86_64 bd3128bce34f2f131f37bc1c7077a4d2e367ff50
+  linux-i386 ccd43b8d56a31d6cfb97ec7997a9ff6dd899f542
+  freebsd-x86_64 408d720f3620ea534eae77fcc4fd6ecb395a6903
+  macos-x86_64 ed29d1f7a72da3ad7dcddf49ef6c3b9a1eed2646
+  macos-i386 dcf74f82ad65b9d5368ced4098827fc9343d694b
+
 S 2012-05-28 7b36d66
   winnt-i386 fe348cb80c7e2722032228643d932d1ba8041871
   linux-x86_64 ec562500380024118f2e9ef2a34e12b3448b5917

trunk/src/test/compile-fail/block-deinitializes-upvar.rs

@@ -1,7 +1,7 @@
-// error-pattern:tried to deinitialize a variable declared in a different
+// error-pattern:moving out of immutable upvar
 fn force(f: fn()) { f(); }
 fn main() {
-    let x = @{x: 17, y: 2};
+    let mut x = @{x: 17, y: 2};
     let y = @{x: 5, y: 5};
 
     force({|| x <- y;});

trunk/src/test/compile-fail/issue-1965.rs

@@ -1,4 +1,4 @@
-// error-pattern:tried to deinitialize a variable declared in a different
+// error-pattern:moving out of immutable upvar
 fn test(-x: uint) {}
 
 fn main() {