---

yaml
---
r: 233588
b: refs/heads/beta
c: 10b8941
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: aa469a994cced0db89fc889322430d41fa6f40eb
+refs/heads/beta: 10b8941bce6d678fafe437bacaf25499d8c6ecf9
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 370fe2786109360f7c35b8ba552b83b773dd71d6
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/librustc/middle/free_region.rs

@@ -93,7 +93,7 @@ impl FreeRegionMap {
         let result = sub == sup || {
             let sub = ty::ReFree(sub);
             let sup = ty::ReFree(sup);
-            self.relation.contains(&sub, &sup) || self.relation.contains(&sup, &ty::ReStatic)
+            self.relation.contains(&sub, &sup) || self.relation.contains(&ty::ReStatic, &sup)
         };
         debug!("sub_free_region(sub={:?}, sup={:?}) = {:?}", sub, sup, result);
         result

branches/beta/src/test/run-pass/regions-free-region-outlives-static-outlives-free-region.rs

@@ -0,0 +1,25 @@
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// Test that we recognize that if you have
+//
+//     'a : 'static
+//
+// then
+//
+//     'a : 'b
+
+fn test<'a,'b>(x: &'a i32) -> &'b i32
+    where 'a: 'static
+{
+    x
+}
+
+fn main() { }