Compute the layout of uninhabited structs

This commit is contained in:
Oliver Scherer 2019-10-02 10:39:35 +02:00
parent 22bc9e1d9c
commit 4eb5fcb09c
4 changed files with 37 additions and 18 deletions

View File

@ -389,10 +389,6 @@ pub enum UnsupportedOpInfo<'tcx> {
/// Free-form case. Only for errors that are never caught! /// Free-form case. Only for errors that are never caught!
Unsupported(String), Unsupported(String),
/// FIXME(#64506) Error used to work around accessing projections of
/// uninhabited types.
UninhabitedValue,
// -- Everything below is not categorized yet -- // -- Everything below is not categorized yet --
FunctionAbiMismatch(Abi, Abi), FunctionAbiMismatch(Abi, Abi),
FunctionArgMismatch(Ty<'tcx>, Ty<'tcx>), FunctionArgMismatch(Ty<'tcx>, Ty<'tcx>),
@ -556,8 +552,6 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
not a power of two"), not a power of two"),
Unsupported(ref msg) => Unsupported(ref msg) =>
write!(f, "{}", msg), write!(f, "{}", msg),
UninhabitedValue =>
write!(f, "tried to use an uninhabited value"),
} }
} }
} }

View File

@ -825,10 +825,18 @@ fn layout_raw_uncached(&self, ty: Ty<'tcx>) -> Result<&'tcx LayoutDetails, Layou
}); });
(present_variants.next(), present_variants.next()) (present_variants.next(), present_variants.next())
}; };
if present_first.is_none() { let present_first = if present_first.is_none() {
// Uninhabited because it has no variants, or only absent ones. if def.is_enum() {
return tcx.layout_raw(param_env.and(tcx.types.never)); // Uninhabited because it has no variants, or only absent ones.
} return tcx.layout_raw(param_env.and(tcx.types.never));
} else {
// if it's a struct, still compute a layout so that we can still compute the
// field offsets
Some(VariantIdx::new(0))
}
} else {
present_first
};
let is_struct = !def.is_enum() || let is_struct = !def.is_enum() ||
// Only one variant is present. // Only one variant is present.

View File

@ -9,7 +9,7 @@
use rustc::mir::interpret::truncate; use rustc::mir::interpret::truncate;
use rustc::ty::{self, Ty}; use rustc::ty::{self, Ty};
use rustc::ty::layout::{ use rustc::ty::layout::{
self, Size, Abi, Align, LayoutOf, TyLayout, HasDataLayout, VariantIdx, PrimitiveExt self, Size, Align, LayoutOf, TyLayout, HasDataLayout, VariantIdx, PrimitiveExt
}; };
use rustc::ty::TypeFoldable; use rustc::ty::TypeFoldable;
@ -377,20 +377,17 @@ pub fn mplace_field(
layout::FieldPlacement::Array { stride, .. } => { layout::FieldPlacement::Array { stride, .. } => {
let len = base.len(self)?; let len = base.len(self)?;
if field >= len { if field >= len {
// This can be violated because this runs during promotion on code where the // This can be violated because the index (field) can be a runtime value
// type system has not yet ensured that such things don't happen. // provided by the user.
debug!("tried to access element {} of array/slice with length {}", field, len); debug!("tried to access element {} of array/slice with length {}", field, len);
throw_panic!(BoundsCheck { len, index: field }); throw_panic!(BoundsCheck { len, index: field });
} }
stride * field stride * field
} }
layout::FieldPlacement::Union(count) => { layout::FieldPlacement::Union(count) => {
// FIXME(#64506) `UninhabitedValue` can be removed when this issue is resolved
if base.layout.abi == Abi::Uninhabited {
throw_unsup!(UninhabitedValue);
}
assert!(field < count as u64, assert!(field < count as u64,
"Tried to access field {} of union with {} fields", field, count); "Tried to access field {} of union {:#?} with {} fields",
field, base.layout, count);
// Offset is always 0 // Offset is always 0
Size::from_bytes(0) Size::from_bytes(0)
} }

View File

@ -0,0 +1,20 @@
// check-pass
#[derive(Copy, Clone)]
pub struct ChildStdin {
inner: AnonPipe,
}
#[derive(Copy, Clone)]
enum AnonPipe {}
const FOO: () = {
union Foo {
a: ChildStdin,
b: (),
}
let x = unsafe { Foo { b: () }.a };
let x = &x.inner;
};
fn main() {}