Rollup merge of #47600 - varkor:empty-never-array, r=eddyb
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 #47563. r? @eddyb
This commit is contained in:
commit
9852b23657
@ -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) => {
|
||||
|
27
src/test/compile-fail/empty-never-array.rs
Normal file
27
src/test/compile-fail/empty-never-array.rs
Normal file
@ -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"));
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user