bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

handle vector layout

Browse source
This commit is contained in:
Erik Desjardins 2020-08-20 18:59:52 -04:00
parent 6fc1d8bc13
commit 24e0913e37
2 changed files with 26 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
compiler/rustc_codegen_ssa/src/mir/place.rs
View file

@ -96,7 +96,7 @@ impl<'a, 'tcx, V: CodegenObject> PlaceRef<'tcx, V> {
let llval = match self.layout.abi {
_ if offset.bytes() == 0 => {
// Unions and newtypes only use an offset of 0.
// Also handles the first field of Scalar and ScalarPair layouts.
// Also handles the first field of Scalar, ScalarPair, and Vector layouts.
self.llval
}
Abi::ScalarPair(ref a, ref b)
@ -105,16 +105,20 @@ impl<'a, 'tcx, V: CodegenObject> PlaceRef<'tcx, V> {
// Offset matches second field.
bx.struct_gep(self.llval, 1)
}
Abi::ScalarPair(..) | Abi::Scalar(_) => {
// ZST fields are not included in Scalar and ScalarPair layouts, so manually offset the pointer.
assert!(
field.is_zst(),
"non-ZST field offset does not match layout: {:?}",
field
);
Abi::Scalar(_) | Abi::ScalarPair(..) | Abi::Vector { .. } if field.is_zst() => {
// ZST fields are not included in Scalar, ScalarPair, and Vector layouts, so manually offset the pointer.
let byte_ptr = bx.pointercast(self.llval, bx.cx().type_i8p());
bx.gep(byte_ptr, &[bx.const_usize(offset.bytes())])
}
Abi::Scalar(_) | Abi::ScalarPair(..) => {
// All fields of Scalar and ScalarPair layouts must have been handled by this point.
// Vector layouts have additional fields for each element of the vector, so don't panic in that case.
bug!(
"offset of non-ZST field `{:?}` does not match layout `{:#?}`",
field,
self.layout
);
}
_ => bx.struct_gep(self.llval, bx.cx().backend_field_index(self.layout, ix)),
};
PlaceRef {