nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-04 19:29:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle PassMode::Cast in combination with #[repr(align)]

Browse Source
This commit is contained in:
bjorn3 2021-01-30 17:22:10 +01:00
parent 18de1b1fde
commit f3447682d0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/abi/pass_mode.rs
View File

@ -227,17 +227,19 @@ pub(super) fn from_casted_value<'tcx>(
cast: CastTarget, cast: CastTarget,
) -> CValue<'tcx> { ) -> CValue<'tcx> {
let abi_params = cast_target_to_abi_params(cast); let abi_params = cast_target_to_abi_params(cast);
let size: u32 = abi_params let abi_param_size: u32 = abi_params
.iter() .iter()
.map(|param| param.value_type.bytes()) .map(|param| param.value_type.bytes())
.sum(); .sum();
// Stack slot size may be bigger for for example `[u8; 3]` which is packed into an `i32`. let layout_size = u32::try_from(layout.size.bytes()).unwrap();
assert!(u64::from(size) >= layout.size.bytes());
let stack_slot = fx.bcx.create_stack_slot(StackSlotData { let stack_slot = fx.bcx.create_stack_slot(StackSlotData {
kind: StackSlotKind::ExplicitSlot, kind: StackSlotKind::ExplicitSlot,
// FIXME Don't force the size to a multiple of 16 bytes once Cranelift gets a way to // FIXME Don't force the size to a multiple of 16 bytes once Cranelift gets a way to
// specify stack slot alignment. // specify stack slot alignment.
size: (size + 15) / 16 * 16, // Stack slot size may be bigger for for example `[u8; 3]` which is packed into an `i32`.
// It may also be smaller for example when the type is a wrapper around an integer with a
// larger alignment than the integer.
size: (std::cmp::max(abi_param_size, layout_size) + 15) / 16 * 16,
offset: None, offset: None,
}); });
let ptr = Pointer::new(fx.bcx.ins().stack_addr(pointer_ty(fx.tcx), stack_slot, 0)); let ptr = Pointer::new(fx.bcx.ins().stack_addr(pointer_ty(fx.tcx), stack_slot, 0));