---

yaml
---
r: 94652
b: refs/heads/try
c: 05e57db
h: refs/heads/master
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: cd5168b7cd9ae02029226f9384e78b2151a883ed
+refs/heads/try: 05e57db348aff7535bb7d2cf49f906d4a5366477
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

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

@@ -1056,11 +1056,11 @@ pub fn get_landing_pad(bcx: @Block) -> BasicBlockRef {
 
     // We store the retval in a function-central alloca, so that calls to
     // Resume can find it.
-    match bcx.fcx.personality {
+    match bcx.fcx.personality.get() {
       Some(addr) => Store(pad_bcx, llretval, addr),
       None => {
         let addr = alloca(pad_bcx, val_ty(llretval), "");
-        bcx.fcx.personality = Some(addr);
+        bcx.fcx.personality.set(Some(addr));
         Store(pad_bcx, llretval, addr);
       }
     }
@@ -1378,7 +1378,7 @@ pub fn cleanup_and_leave(bcx: @Block,
     match leave {
       Some(target) => Br(bcx, target),
       None => {
-          let ll_load = Load(bcx, bcx.fcx.personality.unwrap());
+          let ll_load = Load(bcx, bcx.fcx.personality.get().unwrap());
           Resume(bcx, ll_load);
       }
     }
@@ -1690,7 +1690,7 @@ pub fn new_fn_ctxt_w_id(ccx: @CrateContext,
           alloca_insert_pt: Cell::new(None),
           llreturn: Cell::new(None),
           llself: Cell::new(None),
-          personality: None,
+          personality: Cell::new(None),
           caller_expects_out_pointer: uses_outptr,
           llargs: RefCell::new(HashMap::new()),
           lllocals: RefCell::new(HashMap::new()),

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

@@ -232,7 +232,7 @@ pub struct FunctionContext {
     llself: Cell<Option<ValSelfData>>,
     // The a value alloca'd for calls to upcalls.rust_personality. Used when
     // outputting the resume instruction.
-    personality: Option<ValueRef>,
+    personality: Cell<Option<ValueRef>>,
 
     // True if the caller expects this fn to use the out pointer to
     // return. Either way, your code should write into llretptr, but if