---

yaml
---
r: 30121
b: refs/heads/incoming
c: 38fee95
h: refs/heads/master
i:
  30119: 45f6c84
v: v3

Author: Elliott Slaughter

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 5593add3a8da4bb69ecbece5eaef91f01ca748f7
+refs/heads/incoming: 38fee9526a313104e3f869bf07c24b0c1d203d11
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/rustc/middle/trans/base.rs

@@ -1233,8 +1233,12 @@ fn lazily_emit_tydesc_glue(ccx: @crate_ctxt, field: uint,
 fn call_tydesc_glue_full(++bcx: block, v: ValueRef, tydesc: ValueRef,
                          field: uint, static_ti: Option<@tydesc_info>) {
     let _icx = bcx.insn_ctxt("call_tydesc_glue_full");
-        if bcx.unreachable { return; }
     let ccx = bcx.ccx();
+    // NB: Don't short-circuit even if this block is unreachable because
+    // GC-based cleanup needs to the see that the roots are live.
+    let no_lpads =
+        ccx.sess.opts.debugging_opts & session::no_landing_pads != 0;
+    if bcx.unreachable && !no_lpads { return; }
 
     let static_glue_fn = match static_ti {
       None => None,
@@ -4510,7 +4514,11 @@ fn trans_block_cleanups_(bcx: block,
                          /* cleanup_cx: block, */ is_lpad: bool) ->
    block {
     let _icx = bcx.insn_ctxt("trans_block_cleanups");
-    if bcx.unreachable { return bcx; }
+    // NB: Don't short-circuit even if this block is unreachable because
+    // GC-based cleanup needs to the see that the roots are live.
+    let no_lpads =
+        bcx.ccx().sess.opts.debugging_opts & session::no_landing_pads != 0;
+    if bcx.unreachable && !no_lpads { return bcx; }
     let mut bcx = bcx;
     do vec::riter(cleanups) |cu| {
             match cu {