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.
This commit is contained in:
parent
3bd4af88be
commit
768cbbcd9e
2 changed files with 31 additions and 4 deletions
|
@ -262,10 +262,11 @@ impl<'a, 'gcx, 'tcx> TyS<'tcx> {
|
||||||
}))
|
}))
|
||||||
},
|
},
|
||||||
TyArray(ty, len) => {
|
TyArray(ty, len) => {
|
||||||
if len.val.to_const_int().and_then(|i| i.to_u64()) == Some(0) {
|
match len.val.to_const_int().and_then(|i| i.to_u64()) {
|
||||||
DefIdForest::empty()
|
Some(n) if n != 0 => ty.uninhabited_from(visited, tcx),
|
||||||
} else {
|
// If the array is definitely non-empty, it's uninhabited if
|
||||||
ty.uninhabited_from(visited, tcx)
|
// the type of its elements is uninhabited.
|
||||||
|
_ => DefIdForest::empty()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
TyRef(_, ref tm) => {
|
TyRef(_, ref tm) => {
|
||||||
|
|
26
src/test/compile-fail/empty-never-array.rs
Normal file
26
src/test/compile-fail/empty-never-array.rs
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
// 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"));
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue