---

marijnh · marijnh · commit cb6fdd52cc31 · 2011-09-26T21:34:10.000+02:00
yaml --- r: 5542 b: refs/heads/master c: 345b5a4 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37cf7b92c894f08733235883b200deced9723a2d
+refs/heads/master: 345b5a47bdf4f3ebdcc61c9f3f49a86cf357d025
diff --git a/trunk/src/comp/middle/tstate/collect_locals.rs b/trunk/src/comp/middle/tstate/collect_locals.rs
@@ -138,9 +138,11 @@ fn mk_fn_info(ccx: crate_ctxt, f: _fn, tp: [ty_param], f_sp: span,
         {constrs: res_map,
 
          // add 2 to account for the i_return and i_diverge constraints
+         // FIXME the 1u here is a kludge to make bug #913's impact somewhat
+         // smaller. it should be removed once the bug is really fixed
          num_constraints:
              vec::len(*cx.cs) + vec::len(f.decl.constraints) +
-                 vec::len(f.decl.inputs) + 2u,
+                 vec::len(f.decl.inputs) + 2u + 1u,
          cf: f.decl.cf,
          i_return: ninit(id, name),
          i_diverge: ninit(diverges_id, diverges_name),

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: 37cf7b92c894f08733235883b200deced9723a2d`
	`2`	`+refs/heads/master: 345b5a47bdf4f3ebdcc61c9f3f49a86cf357d025`