about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNiko Matsakis <niko@alum.mit.edu>2013-03-26 09:41:27 -0400
committerNiko Matsakis <niko@alum.mit.edu>2013-03-26 14:12:13 -0400
commit5f52669296bceac4907608a6ac3bfba41de7dab9 (patch)
tree32d8f930bf170d632e9f9dfa1bd703acf0cc786b
parent7f5d7e1c2e7464916694e55ba4f31bf5b8f9a4f9 (diff)
downloadrust-5f52669296bceac4907608a6ac3bfba41de7dab9.tar.gz
rust-5f52669296bceac4907608a6ac3bfba41de7dab9.zip
Fix #4855: handle bot in regionck
-rw-r--r--src/librustc/middle/typeck/check/regionck.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc/middle/typeck/check/regionck.rs b/src/librustc/middle/typeck/check/regionck.rs
index 3a02c19dbaf..d6a7e6103b1 100644
--- a/src/librustc/middle/typeck/check/regionck.rs
+++ b/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);