---

yaml
---
r: 147599
b: refs/heads/try2
c: d7392bd
h: refs/heads/master
i:
  147597: 77fde79
  147595: 73a7e0b
  147591: 8ec8032
  147583: a99a75c
v: v3

Author: pcwalton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: c909c34b5de27fbd0a90b04e9d9c03130c45452b
+refs/heads/try2: d7392bd3aec5ca3d017745f1a47b38df9ddaf968
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/trans/base.rs

@@ -69,7 +69,7 @@ use util::sha2::Sha256;
 use middle::trans::type_::Type;
 
 use std::c_str::ToCStr;
-use std::cell::RefCell;
+use std::cell::{Cell, RefCell};
 use std::hashmap::HashMap;
 use std::libc::c_uint;
 use std::vec;
@@ -1683,7 +1683,7 @@ pub fn new_fn_ctxt_w_id(ccx: @CrateContext,
     let fcx = @mut FunctionContext {
           llfn: llfndecl,
           llenv: unsafe {
-              llvm::LLVMGetUndef(Type::i8p().to_ref())
+              Cell::new(llvm::LLVMGetUndef(Type::i8p().to_ref()))
           },
           llretptr: None,
           entry_bcx: None,
@@ -1702,9 +1702,9 @@ pub fn new_fn_ctxt_w_id(ccx: @CrateContext,
           ccx: ccx,
           debug_context: debug_context,
     };
-    fcx.llenv = unsafe {
+    fcx.llenv.set(unsafe {
           llvm::LLVMGetParam(llfndecl, fcx.env_arg_pos() as c_uint)
-    };
+    });
 
     unsafe {
         let entry_bcx = top_scope_block(fcx, opt_node_info);
@@ -1759,7 +1759,7 @@ pub fn create_llargs_for_fn_args(cx: @mut FunctionContext,
     match self_arg {
       impl_self(tt, self_mode) => {
         cx.llself = Some(ValSelfData {
-            v: cx.llenv,
+            v: cx.llenv.get(),
             t: tt,
             is_copy: self_mode == ty::ByCopy
         });

branches/try2/src/librustc/middle/trans/closure.rs

@@ -307,7 +307,7 @@ pub fn load_environment(fcx: @mut FunctionContext,
     let bcx = fcx.entry_bcx.unwrap();
 
     // Load a pointer to the closure data, skipping over the box header:
-    let llcdata = opaque_box_body(bcx, cdata_ty, fcx.llenv);
+    let llcdata = opaque_box_body(bcx, cdata_ty, fcx.llenv.get());
 
     // Store the pointer to closure data in an alloca for debug info because that's what the
     // llvm.dbg.declare intrinsic expects

branches/try2/src/librustc/middle/trans/common.rs

@@ -206,7 +206,7 @@ pub struct FunctionContext {
 
     // The implicit environment argument that arrives in the function we're
     // creating.
-    llenv: ValueRef,
+    llenv: Cell<ValueRef>,
 
     // The place to store the return value. If the return type is immediate,
     // this is an alloca in the function. Otherwise, it's the hidden first