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

extract TyAndLayout::peel_transparent_wrappers helper

Browse source
This commit is contained in:
Folkert de Vries 2026-02-05 19:30:33 +01:00
parent df0bdea545
commit eb9d5153dc
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
2 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
compiler/rustc_abi/src/layout/ty.rs
View file

@ -290,7 +290,19 @@ impl<'a, Ty> TyAndLayout<'a, Ty> {
/// function call isn't allowed (a.k.a. `va_list`).
///
/// This function handles transparent types automatically.
pub fn pass_indirectly_in_non_rustic_abis<C>(mut self, cx: &C) -> bool
pub fn pass_indirectly_in_non_rustic_abis<C>(self, cx: &C) -> bool
where
Ty: TyAbiInterface<'a, C> + Copy,
{
let base = self.peel_transparent_wrappers(cx);
Ty::is_pass_indirectly_in_non_rustic_abis_flag_set(base)
}
/// Recursively peel away transparent wrappers, returning the inner value.
///
/// The return value is not `repr(transparent)` and/or does
/// not have a non-1zst field.
pub fn peel_transparent_wrappers<C>(mut self, cx: &C) -> Self
where
Ty: TyAbiInterface<'a, C> + Copy,
{
@ -300,7 +312,7 @@ impl<'a, Ty> TyAndLayout<'a, Ty> {
self = field;
}
Ty::is_pass_indirectly_in_non_rustic_abis_flag_set(self)
self
}
/// Finds the one field that is not a 1-ZST.

16
compiler/rustc_hir_analysis/src/hir_ty_lowering/cmse.rs
View file

@ -160,7 +160,7 @@ fn is_valid_cmse_output<'tcx>(
}
/// Returns whether the output will fit into the available registers
fn is_valid_cmse_output_layout<'tcx>(cx: LayoutCx<'tcx>, mut layout: TyAndLayout<'tcx>) -> bool {
fn is_valid_cmse_output_layout<'tcx>(cx: LayoutCx<'tcx>, layout: TyAndLayout<'tcx>) -> bool {
let size = layout.layout.size().bytes();
if size <= 4 {
@ -169,21 +169,9 @@ fn is_valid_cmse_output_layout<'tcx>(cx: LayoutCx<'tcx>, mut layout: TyAndLayout
return false;
}
// Find the wrapped inner type of a transparent wrapper.
loop {
match layout.ty.kind() {
ty::Adt(adt_def, _) if adt_def.repr().transparent() => {
// Find the non-1-ZST field, and recurse.
(_, layout) = layout.non_1zst_field(&cx).unwrap();
}
// Not a transparent type, no further unfolding.
_ => break,
}
}
// Accept (transparently wrapped) scalar 64-bit primitives.
matches!(
layout.ty.kind(),
layout.peel_transparent_wrappers(&cx).ty.kind(),
ty::Int(ty::IntTy::I64) | ty::Uint(ty::UintTy::U64) | ty::Float(ty::FloatTy::F64)
)
}