---

yaml
---
r: 89021
b: refs/heads/snap-stage3
c: 8728b09
h: refs/heads/master
i:
  89019: 43d38b2
v: v3

Author: pcwalton

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: deeca5d586bfaa4aa60246f671a8d611d38f6248
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 7acaa73377e9ed8b337a66c968286e6581dc7b24
+refs/heads/snap-stage3: 8728b09e78805672d0e948118b29064921da0278
 refs/heads/try: b160761e35efcd1207112b3b782c06633cf441a8
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

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

@@ -997,7 +997,7 @@ pub fn need_invoke(bcx: @Block) -> bool {
 pub fn have_cached_lpad(bcx: @Block) -> bool {
     let mut res = false;
     in_lpad_scope_cx(bcx, |inf| {
-        match inf.landing_pad {
+        match inf.landing_pad.get() {
           Some(_) => res = true,
           None => res = false
         }
@@ -1032,11 +1032,11 @@ pub fn get_landing_pad(bcx: @Block) -> BasicBlockRef {
     let mut pad_bcx = bcx; // Guaranteed to be set below
     in_lpad_scope_cx(bcx, |inf| {
         // If there is a valid landing pad still around, use it
-        match inf.landing_pad {
+        match inf.landing_pad.get() {
           Some(target) => cached = Some(target),
           None => {
             pad_bcx = lpad_block(bcx, "unwind");
-            inf.landing_pad = Some(pad_bcx.llbb);
+            inf.landing_pad.set(Some(pad_bcx.llbb));
           }
         }
     });
@@ -1224,7 +1224,7 @@ pub fn simple_block_scope(parent: Option<@mut ScopeInfo>,
         loop_label: None,
         cleanups: RefCell::new(~[]),
         cleanup_paths: RefCell::new(~[]),
-        landing_pad: None,
+        landing_pad: Cell::new(None),
         node_info: node_info,
     }
 }
@@ -1254,7 +1254,7 @@ pub fn loop_scope_block(bcx: @Block,
         loop_label: loop_label,
         cleanups: RefCell::new(~[]),
         cleanup_paths: RefCell::new(~[]),
-        landing_pad: None,
+        landing_pad: Cell::new(None),
         node_info: opt_node_info,
     }), bcx.is_lpad, n, opt_node_info);
 }

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

@@ -431,7 +431,7 @@ pub struct cleanup_path {
 }
 
 pub fn shrink_scope_clean(scope_info: &mut ScopeInfo, size: uint) {
-    scope_info.landing_pad = None;
+    scope_info.landing_pad.set(None);
     let new_cleanup_paths = {
         let cleanup_paths = scope_info.cleanup_paths.borrow();
         cleanup_paths.get()
@@ -444,7 +444,7 @@ pub fn shrink_scope_clean(scope_info: &mut ScopeInfo, size: uint) {
 }
 
 pub fn grow_scope_clean(scope_info: &mut ScopeInfo) {
-    scope_info.landing_pad = None;
+    scope_info.landing_pad.set(None);
 }
 
 pub fn cleanup_type(cx: ty::ctxt, ty: ty::t) -> cleantype {
@@ -634,7 +634,7 @@ pub struct ScopeInfo {
     // cleared when the set of cleanups changes.
     cleanup_paths: RefCell<~[cleanup_path]>,
     // Unwinding landing pad. Also cleared when cleanups change.
-    landing_pad: Option<BasicBlockRef>,
+    landing_pad: Cell<Option<BasicBlockRef>>,
     // info about the AST node this scope originated from, if any
     node_info: Option<NodeInfo>,
 }