---

pcwalton · pcwalton · commit 4423b8846515 · 2011-06-08T12:24:05.000-07:00
yaml --- r: 2972 b: refs/heads/master c: 4571172 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f54f2799c33729f124332d69deb7205237a0f018
+refs/heads/master: 4571172c03bec1ea7ab2af6fff640ba9b479aed0
diff --git a/trunk/src/comp/middle/ty.rs b/trunk/src/comp/middle/ty.rs
@@ -2574,9 +2574,11 @@ mod unify {
 
     fn resolve_type_var(&ty_ctxt tcx, &@var_bindings vb, int vid)
             -> fixup_result {
+        if ((vid as uint) >= ufind::set_count(vb.sets)) { ret fix_err(vid); }
+
         auto root_id = ufind::find(vb.sets, vid as uint);
         alt (smallintmap::find[t](vb.types, root_id)) {
-            case (none[t]) { ret fix_ok(mk_var(tcx, vid)); }
+            case (none[t]) { ret fix_err(vid); }
             case (some[t](?rt)) { ret fixup_vars(tcx, vb, rt); }
         }
     }
diff --git a/trunk/src/comp/middle/typeck.rs b/trunk/src/comp/middle/typeck.rs

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: f54f2799c33729f124332d69deb7205237a0f018`
	`2`	`+refs/heads/master: 4571172c03bec1ea7ab2af6fff640ba9b479aed0`
Original file line number	Diff line number	Diff line change
`@@ -2574,9 +2574,11 @@ mod unify {`
`2574`	`2574`
`2575`	`2575`	`fn resolve_type_var(&ty_ctxt tcx, &@var_bindings vb, int vid)`
`2576`	`2576`	`-> fixup_result {`
	`2577`	`+ if ((vid as uint) >= ufind::set_count(vb.sets)) { ret fix_err(vid); }`
	`2578`	`+`
`2577`	`2579`	`auto root_id = ufind::find(vb.sets, vid as uint);`
`2578`	`2580`	`alt (smallintmap::find[t](vb.types, root_id)) {`
`2579`		`- case (none[t]) { ret fix_ok(mk_var(tcx, vid)); }`
	`2581`	`+ case (none[t]) { ret fix_err(vid); }`
`2580`	`2582`	`case (some[t](?rt)) { ret fixup_vars(tcx, vb, rt); }`
`2581`	`2583`	`}`
`2582`	`2584`	`}`