mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash when struct argument size is not a multiple of the pointer size

Browse Source 
Fixes #1200
This commit is contained in:
bjorn3 2021-12-15 16:53:35 +01:00
parent 057635b9da
commit f74cf39a74
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/abi/pass_mode.rs
View File

@ -117,7 +117,9 @@ impl<'tcx> ArgAbiExt<'tcx> for ArgAbi<'tcx, Ty<'tcx>> {
PassMode::Cast(cast) => cast_target_to_abi_params(cast), PassMode::Cast(cast) => cast_target_to_abi_params(cast),
PassMode::Indirect { attrs, extra_attrs: None, on_stack } => { PassMode::Indirect { attrs, extra_attrs: None, on_stack } => {
if on_stack { if on_stack {
let size = u32::try_from(self.layout.size.bytes()).unwrap(); // Abi requires aligning struct size to pointer size
let size = self.layout.size.align_to(tcx.data_layout.pointer_align.abi);
let size = u32::try_from(size.bytes()).unwrap();
smallvec![apply_arg_attrs_to_abi_param( smallvec![apply_arg_attrs_to_abi_param(
AbiParam::special(pointer_ty(tcx), ArgumentPurpose::StructArgument(size),), AbiParam::special(pointer_ty(tcx), ArgumentPurpose::StructArgument(size),),
attrs attrs