Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-06-02 06:28:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

Process untagged unions

Browse Source
This commit is contained in:
Oliver Schneider
2017-07-31 17:14:49 +02:00
parent 393216d410
commit 79f38bf2cd
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/librustc_mir/interpret/eval_context.rs
+6 -2
View File
@@ -955,6 +955,8 @@ pub fn get_field_ty(&self, ty: Ty<'tcx>, field_index: usize) -> EvalResult<'tcx,
let variant_def = adt_def.struct_variant();
use rustc::ty::layout::Layout::*;
match *self.type_layout(ty)? {
UntaggedUnion { ref variants } =>
Ok(TyAndPacked { ty: variant_def.fields[field_index].ty(self.tcx, substs), packed: variants.packed }),
Univariant { ref variant, .. } =>
Ok(TyAndPacked { ty: variant_def.fields[field_index].ty(self.tcx, substs), packed: variant.packed }),
_ => Err(EvalError::Unimplemented(format!("get_field_ty can't handle struct type: {:?}, {:?}", ty, ty.sty))),
@@ -988,8 +990,9 @@ fn get_field_offset(&self, ty: Ty<'tcx>, field_index: usize) -> EvalResult<'tcx,
StructWrappedNullablePointer { ref nonnull, .. } => {
Ok(nonnull.offsets[field_index])
}
UntaggedUnion { .. } => Ok(Size::from_bytes(0)),
_ => {
let msg = format!("can't handle type: {:?}, with layout: {:?}", ty, layout);
let msg = format!("get_field_offset: can't handle type: {:?}, with layout: {:?}", ty, layout);
Err(EvalError::Unimplemented(msg))
}
}
@@ -1006,8 +1009,9 @@ pub fn get_field_count(&self, ty: Ty<'tcx>) -> EvalResult<'tcx, u64> {
Vector { count , .. } |
Array { count, .. } => Ok(count),
Scalar { .. } => Ok(0),
UntaggedUnion { .. } => Ok(1),
_ => {
let msg = format!("can't handle type: {:?}, with layout: {:?}", ty, layout);
let msg = format!("get_field_count: can't handle type: {:?}, with layout: {:?}", ty, layout);
Err(EvalError::Unimplemented(msg))
}
}