---

yaml
---
r: 94651
b: refs/heads/try
c: cd5168b
h: refs/heads/master
i:
  94649: 0da5e73
  94647: e16f2bf
v: v3

Author: pcwalton

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
-refs/heads/try: bd6a2236e1b57050729071c6178d5c3937a38141
+refs/heads/try: cd5168b7cd9ae02029226f9384e78b2151a883ed
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

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

@@ -1689,7 +1689,7 @@ pub fn new_fn_ctxt_w_id(ccx: @CrateContext,
           entry_bcx: None,
           alloca_insert_pt: Cell::new(None),
           llreturn: Cell::new(None),
-          llself: None,
+          llself: Cell::new(None),
           personality: None,
           caller_expects_out_pointer: uses_outptr,
           llargs: RefCell::new(HashMap::new()),
@@ -1760,11 +1760,11 @@ pub fn create_llargs_for_fn_args(cx: @mut FunctionContext,
 
     match self_arg {
       impl_self(tt, self_mode) => {
-        cx.llself = Some(ValSelfData {
+        cx.llself.set(Some(ValSelfData {
             v: cx.llenv.get(),
             t: tt,
             is_copy: self_mode == ty::ByCopy
-        });
+        }));
       }
       no_self => ()
     }
@@ -1788,7 +1788,7 @@ pub fn copy_args_to_allocas(fcx: @mut FunctionContext,
     let _icx = push_ctxt("copy_args_to_allocas");
     let mut bcx = bcx;
 
-    match fcx.llself {
+    match fcx.llself.get() {
         Some(slf) => {
             let self_val = if slf.is_copy
                     && datum::appropriate_mode(bcx.ccx(), slf.t).is_by_value() {
@@ -1800,7 +1800,7 @@ pub fn copy_args_to_allocas(fcx: @mut FunctionContext,
                 PointerCast(bcx, slf.v, type_of(bcx.ccx(), slf.t).ptr_to())
             };
 
-            fcx.llself = Some(ValSelfData {v: self_val, ..slf});
+            fcx.llself.set(Some(ValSelfData {v: self_val, ..slf}));
             add_clean(bcx, self_val, slf.t);
 
             if fcx.ccx.sess.opts.extra_debuginfo {

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

@@ -229,7 +229,7 @@ pub struct FunctionContext {
     // NB: This is the type of the self *variable*, not the self *type*. The
     // self type is set only for default methods, while the self variable is
     // set for all methods.
-    llself: Option<ValSelfData>,
+    llself: Cell<Option<ValSelfData>>,
     // The a value alloca'd for calls to upcalls.rust_personality. Used when
     // outputting the resume instruction.
     personality: Option<ValueRef>,

branches/try/src/librustc/middle/trans/expr.rs

@@ -1108,8 +1108,8 @@ pub fn trans_local_var(bcx: @Block, def: ast::Def) -> Datum {
             take_local(bcx, lllocals.get(), nid)
         }
         ast::DefSelf(nid, _) => {
-            let self_info: ValSelfData = match bcx.fcx.llself {
-                Some(ref self_info) => *self_info,
+            let self_info: ValSelfData = match bcx.fcx.llself.get() {
+                Some(self_info) => self_info,
                 None => {
                     bcx.sess().bug(format!(
                         "trans_local_var: reference to self \