---

yaml
---
r: 49594
b: refs/heads/master
c: bbc4ca1
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: e5f8026ebab867547514677bf9d7c7870a4345ad
+refs/heads/master: bbc4ca134900456ba2a00368ec1f19bc1a357528
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: f7a2371c176663d59062ec5158f39faecba45768
 refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea

trunk/src/libcore/unstable/lang.rs

@@ -99,8 +99,12 @@ pub unsafe fn borrow_as_imm(a: *u8) {
 #[lang="return_to_mut"]
 #[inline(always)]
 pub unsafe fn return_to_mut(a: *u8) {
-    let a: *mut BoxRepr = transmute(a);
-    (*a).header.ref_count &= !FROZEN_BIT;
+    // Sometimes the box is null, if it is conditionally frozen.
+    // See e.g. #4904.
+    if !a.is_null() {
+        let a: *mut BoxRepr = transmute(a);
+        (*a).header.ref_count &= !FROZEN_BIT;
+    }
 }
 
 #[lang="check_not_borrowed"]

trunk/src/librustc/middle/typeck/check/regionck.rs

@@ -615,7 +615,7 @@ pub mod guarantor {
         // expressions, both of which always yield a region variable, so
         // mk_subr should never fail.
         let rptr_ty = rcx.resolve_node_type(id);
-        if !ty::type_is_error(rptr_ty) {
+        if !ty::type_is_error(rptr_ty) && !ty::type_is_bot(rptr_ty) {
             let tcx = rcx.fcx.ccx.tcx;
             debug!("rptr_ty=%s", ty_to_str(tcx, rptr_ty));
             let r = ty::ty_region(tcx, span, rptr_ty);