---

pcwalton · pcwalton · commit 82bc1f6409b5 · 2011-06-09T14:04:11.000-07:00
yaml --- r: 2999 b: refs/heads/master c: 3009574 h: refs/heads/master i: 2997: 264fa0f 2995: 533ab8b 2991: c690f9c v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c1be2aeba334f260ebb23d885af1242f5fd52f1
+refs/heads/master: 3009574165ca607d1d12bd9a557f06776f69927a
diff --git a/trunk/src/comp/middle/ty.rs b/trunk/src/comp/middle/ty.rs
@@ -1810,9 +1810,10 @@ mod unify {
 
     fn record_var_binding(&@ctxt cx, int key, t typ) -> result {
         ufind::grow(cx.vb.sets, (key as uint) + 1u);
+        auto root = ufind::find(cx.vb.sets, key as uint);
 
         auto result_type = typ;
-        alt (smallintmap::find[t](cx.vb.types, key as uint)) {
+        alt (smallintmap::find[t](cx.vb.types, root)) {
             case (some(?old_type)) {
                 alt (unify_step(cx, old_type, typ)) {
                     case (ures_ok(?unified_type)) {
@@ -1824,7 +1825,7 @@ mod unify {
             case (none) { /* fall through */ }
         }
 
-        smallintmap::insert[t](cx.vb.types, key as uint, result_type);
+        smallintmap::insert[t](cx.vb.types, root, result_type);
         ret ures_ok(typ);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: 3c1be2aeba334f260ebb23d885af1242f5fd52f1`
	`2`	`+refs/heads/master: 3009574165ca607d1d12bd9a557f06776f69927a`