user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix len() on non-array but array-layout types (e.g. SIMD)

Browse source
This commit is contained in:
Ralf Jung 2018-08-25 18:32:01 +02:00
parent 07bdd48b60
commit c38cc896dc
2 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/librustc_mir/interpret/place.rs
View file

@ -137,19 +137,20 @@ impl<'tcx> MPlaceTy<'tcx> {
#[inline]
pub(super) fn len(self, cx: impl HasDataLayout) -> EvalResult<'tcx, u64> {
match self.layout.ty.sty {
ty::Array(..) => {
// Sized, get length from layout.
debug_assert!(self.extra.is_none());
match self.layout.fields {
layout::FieldPlacement::Array { count, .. } => Ok(count),
_ => bug!("Length for non-array layout {:?} requested", self.layout),
}
if self.layout.is_unsized() {
// We need to consult `extra` metadata
match self.layout.ty.sty {
ty::Slice(..) | ty::Str =>
return self.extra.unwrap().to_usize(cx),
_ => bug!("len not supported on unsized type {:?}", self.layout.ty),
}
ty::Slice(..) | ty::Str => {
self.extra.unwrap().to_usize(cx)
} else {
// Go through the layout. There are lots of types that support a length,
// e.g. SIMD types.
match self.layout.fields {
layout::FieldPlacement::Array { count, .. } => Ok(count),
_ => bug!("len not supported on sized type {:?}", self.layout.ty),
}
_ => bug!("len not supported on type {:?}", self.layout.ty),
}
}

6
src/librustc_mir/interpret/validity.rs
View file

@ -332,8 +332,9 @@ impl<'a, 'mir, 'tcx, M: Machine<'mir, 'tcx>> EvalContext<'a, 'mir, 'tcx, M> {
}
}
}
ty::Array(..) | ty::Slice(..) => {
// This handles the unsized case correctly as well
_ => {
// This handles the unsized case correctly as well, as well as
// SIMD an all sorts of other array-like types.
for (i, field) in self.mplace_array_fields(dest)?.enumerate() {
let field = field?;
path.push(PathElem::ArrayElem(i));
@ -341,7 +342,6 @@ impl<'a, 'mir, 'tcx, M: Machine<'mir, 'tcx>> EvalContext<'a, 'mir, 'tcx, M> {
path.truncate(path_len);
}
}
_ => bug!("Array layout for non-array type {:?}", dest.layout.ty),
}
},
layout::FieldPlacement::Array { .. } => {