---

yaml
---
r: 15346
b: refs/heads/try
c: 4856eab
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

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

branches/try/src/rustc/middle/infer.rs

@@ -978,6 +978,10 @@ iface combine {
     fn c_regions_scope_scope(
         a: ty::region, a_id: ast::node_id,
         b: ty::region, b_id: ast::node_id) -> cres<ty::region>;
+    fn c_regions_scope_free(
+        a: ty::region, a_id: ast::node_id,
+        b: ty::region, b_id: ast::node_id, b_br: ty::bound_region)
+        -> cres<ty::region>;
     fn c_regions_free_scope(
         a: ty::region, a_id: ast::node_id, a_br: ty::bound_region,
         b: ty::region, b_id: ast::node_id) -> cres<ty::region>;
@@ -1327,9 +1331,12 @@ fn c_regions<C:combine>(
                 {|x, y| self.c_regions(x, y) })
       }
 
-      (f @ ty::re_free(f_id, f_br), s @ ty::re_scope(s_id)) |
-      (s @ ty::re_scope(s_id), f @ ty::re_free(f_id, f_br)) {
-        self.c_regions_free_scope(f, f_id, f_br, s, s_id)
+      (ty::re_free(a_id, a_br), ty::re_scope(b_id)) {
+        self.c_regions_free_scope(a, a_id, a_br, b, b_id)
+      }
+
+      (ty::re_scope(a_id), ty::re_free(b_id, b_br)) {
+        self.c_regions_scope_free(b, b_id, b, b_id, b_br)
       }
 
       (ty::re_scope(a_id), ty::re_scope(b_id)) {
@@ -1473,6 +1480,15 @@ impl of combine for lub {
         ret ok(a); // NDM--not so for nested functions
     }
 
+    fn c_regions_scope_free(
+        a: ty::region, a_id: ast::node_id,
+        b: ty::region, b_id: ast::node_id, b_br: ty::bound_region)
+        -> cres<ty::region> {
+
+        // LUB is commutative:
+        self.c_regions_free_scope(b, b_id, b_br, a, a_id)
+    }
+
     fn c_regions_scope_scope(a: ty::region, a_id: ast::node_id,
                              b: ty::region, b_id: ast::node_id)
         -> cres<ty::region> {
@@ -1614,6 +1630,15 @@ impl of combine for glb {
         ret ok(b); // NDM--not so for nested functions
     }
 
+    fn c_regions_scope_free(
+        a: ty::region, a_id: ast::node_id,
+        b: ty::region, b_id: ast::node_id, b_br: ty::bound_region)
+        -> cres<ty::region> {
+
+        // GLB is commutative:
+        self.c_regions_free_scope(b, b_id, b_br, a, a_id)
+    }
+
     fn c_regions_scope_scope(a: ty::region, a_id: ast::node_id,
                              b: ty::region, b_id: ast::node_id)
         -> cres<ty::region> {