---

yaml
---
r: 105176
b: refs/heads/snap-stage3
c: b8ed136
h: refs/heads/master
v: v3

Author: emberian

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 62f1d68439dcfd509eaca29887afa97f22938373
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 7febdb7b15681a6a70da191128a9552f35ed5644
+refs/heads/snap-stage3: b8ed13686ad1f883f3de1e7fa5ba5bf9f92ae5d2
 refs/heads/try: db814977d07bd798feb24f6b74c00800ef458a13
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/trans/base.rs

@@ -246,7 +246,8 @@ fn get_extern_rust_fn(ccx: &CrateContext, inputs: &[ty::t], output: ty::t,
 pub fn decl_rust_fn(ccx: &CrateContext, has_env: bool,
                     inputs: &[ty::t], output: ty::t,
                     name: &str) -> ValueRef {
-    use middle::ty::{FreeRegion, BrAnon, ReFree, ReLateBound};
+    use middle::ty::{BrAnon, ReLateBound};
+
     let llfty = type_of_rust_fn(ccx, has_env, inputs, output);
     let llfn = decl_cdecl_fn(ccx.llmod, name, llfty, output);
 
@@ -270,8 +271,7 @@ pub fn decl_rust_fn(ccx: &CrateContext, has_env: bool,
             // When a reference in an argument has no named lifetime, it's
             // impossible for that reference to escape this function(ie, be
             // returned).
-            ty::ty_rptr(ReFree(FreeRegion { scope_id: _, bound_region: BrAnon(_) }), _) |
-                ty::ty_rptr(ReLateBound(_, BrAnon(_)), _) => {
+            ty::ty_rptr(ReLateBound(_, BrAnon(_)), _) => {
                 debug!("marking argument of {} as nocapture because of anonymous lifetime", name);
                 unsafe {
                     llvm::LLVMAddAttribute(llarg, lib::llvm::NoCaptureAttribute as c_uint);

branches/snap-stage3/src/librustc/middle/trans/callee.rs

@@ -708,8 +708,9 @@ pub fn trans_call_inner<'a>(
 
         debug!("trans_callee_inner: first_arg_offset={}", first_arg_offset);
 
-        for (idx, &t) in ty::ty_fn_args(callee_ty).iter().enumerate().map(|(i, v)| (i+first_arg_offset, v)) {
-            use middle::ty::{FreeRegion, BrAnon, ReFree, ReLateBound};
+        for (idx, &t) in ty::ty_fn_args(callee_ty).iter().enumerate()
+                                                  .map(|(i, v)| (i+first_arg_offset, v)) {
+            use middle::ty::{BrAnon, ReLateBound};
             if !type_is_immediate(ccx, t) {
                 // if it's not immediate, we have a program-invisible pointer,
                 // which it can't possibly capture
@@ -720,10 +721,9 @@ pub fn trans_call_inner<'a>(
 
             let t_ = ty::get(t);
             match t_.sty {
-                ty::ty_rptr(ReFree(FreeRegion { scope_id: _, bound_region: BrAnon(_) }), _) |
-                    ty::ty_rptr(ReLateBound(_, BrAnon(_)), _) => {
-
-                    debug!("trans_callee_inner: argument {} nocapture because of anonymous lifetime", idx);
+                ty::ty_rptr(ReLateBound(_, BrAnon(_)), _) => {
+                    debug!("trans_callee_inner: argument {} nocapture because \
+                           of anonymous lifetime", idx);
                     attrs.push((idx, NoCaptureAttribute));
                 },
                 _ => { }