Skip to content

Commit

Permalink
Rollup merge of rust-lang#47600 - varkor:empty-never-array, r=eddyb
Browse files Browse the repository at this point in the history
Fix type inhabitedness check for arrays

Arrays of uninhabited types were considered to also be uninhabited if
their length had not been evaluated, causing unsoundness.

Fixes rust-lang#47563.

r? @eddyb
  • Loading branch information
alexcrichton authored Jan 25, 2018
2 parents 31f1aa5 + c4d0bb3 commit 9852b23
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 4 deletions.
9 changes: 5 additions & 4 deletions src/librustc/ty/inhabitedness/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -262,10 +262,11 @@ impl<'a, 'gcx, 'tcx> TyS<'tcx> {
}))
},
TyArray(ty, len) => {
if len.val.to_const_int().and_then(|i| i.to_u64()) == Some(0) {
DefIdForest::empty()
} else {
ty.uninhabited_from(visited, tcx)
match len.val.to_const_int().and_then(|i| i.to_u64()) {
// If the array is definitely non-empty, it's uninhabited if
// the type of its elements is uninhabited.
Some(n) if n != 0 => ty.uninhabited_from(visited, tcx),
_ => DefIdForest::empty()
}
}
TyRef(_, ref tm) => {
Expand Down
27 changes: 27 additions & 0 deletions src/test/compile-fail/empty-never-array.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(never_type)]

enum Helper<T, U> {
T(T, [!; 0]),
#[allow(dead_code)]
U(U),
}

fn transmute<T, U>(t: T) -> U {
let Helper::U(u) = Helper::T(t, []);
//~^ ERROR refutable pattern in local binding: `T(_, _)` not covered
u
}

fn main() {
println!("{:?}", transmute::<&str, (*const u8, u64)>("type safety"));
}

0 comments on commit 9852b23

Please sign in to comment.