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

remove useless parameter

Browse Source 
Remove the `repr` parameter from the wrappers around `calc.univariant`,
because it's always defaulted. Only ADTs can have a repr and those call
`calc.layout_of_struct_or_enum` and not `calc.univariant`.
This commit is contained in:
Lukas Markeffsky 2025-02-16 01:17:08 +01:00
parent 1d1ac3d310
commit 67345f9203
1 changed files with 10 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
compiler/rustc_ty_utils/src/layout.rs
View File

@ -134,15 +134,10 @@ fn univariant_uninterned<'tcx>(
cx: &LayoutCx<'tcx>, cx: &LayoutCx<'tcx>,
ty: Ty<'tcx>, ty: Ty<'tcx>,
fields: &IndexSlice<FieldIdx, TyAndLayout<'tcx>>, fields: &IndexSlice<FieldIdx, TyAndLayout<'tcx>>,
repr: &ReprOptions,
kind: StructKind, kind: StructKind,
) -> Result<LayoutData<FieldIdx, VariantIdx>, &'tcx LayoutError<'tcx>> { ) -> Result<LayoutData<FieldIdx, VariantIdx>, &'tcx LayoutError<'tcx>> {
let pack = repr.pack; let repr = ReprOptions::default();
if pack.is_some() && repr.align.is_some() { cx.calc.univariant(fields, &repr, kind).map_err(|err| map_error(cx, ty, err))
cx.tcx().dcx().bug("struct cannot be packed and aligned");
}
cx.calc.univariant(fields, repr, kind).map_err(|err| map_error(cx, ty, err))
} }
fn extract_const_value<'tcx>( fn extract_const_value<'tcx>(
@ -189,10 +184,9 @@ fn layout_of_uncached<'tcx>(
}; };
let scalar = |value: Primitive| tcx.mk_layout(LayoutData::scalar(cx, scalar_unit(value))); let scalar = |value: Primitive| tcx.mk_layout(LayoutData::scalar(cx, scalar_unit(value)));
let univariant = let univariant = |fields: &IndexSlice<FieldIdx, TyAndLayout<'tcx>>, kind| {
|fields: &IndexSlice<FieldIdx, TyAndLayout<'tcx>>, repr: &ReprOptions, kind| { Ok(tcx.mk_layout(univariant_uninterned(cx, ty, fields, kind)?))
Ok(tcx.mk_layout(univariant_uninterned(cx, ty, fields, repr, kind)?)) };
};
debug_assert!(!ty.has_non_region_infer()); debug_assert!(!ty.has_non_region_infer());
Ok(match *ty.kind() { Ok(match *ty.kind() {
@ -405,17 +399,10 @@ fn layout_of_uncached<'tcx>(
}), }),
// Odd unit types. // Odd unit types.
ty::FnDef(..) => { ty::FnDef(..) => univariant(IndexSlice::empty(), StructKind::AlwaysSized)?,
univariant(IndexSlice::empty(), &ReprOptions::default(), StructKind::AlwaysSized)?
}
ty::Dynamic(_, _, ty::Dyn) | ty::Foreign(..) => { ty::Dynamic(_, _, ty::Dyn) | ty::Foreign(..) => {
let mut unit = univariant_uninterned( let mut unit =
cx, univariant_uninterned(cx, ty, IndexSlice::empty(), StructKind::AlwaysSized)?;
ty,
IndexSlice::empty(),
&ReprOptions::default(),
StructKind::AlwaysSized,
)?;
match unit.backend_repr { match unit.backend_repr {
BackendRepr::Memory { ref mut sized } => *sized = false, BackendRepr::Memory { ref mut sized } => *sized = false,
_ => bug!(), _ => bug!(),
@ -429,7 +416,6 @@ fn layout_of_uncached<'tcx>(
let tys = args.as_closure().upvar_tys(); let tys = args.as_closure().upvar_tys();
univariant( univariant(
&tys.iter().map(|ty| cx.layout_of(ty)).try_collect::<IndexVec<_, _>>()?, &tys.iter().map(|ty| cx.layout_of(ty)).try_collect::<IndexVec<_, _>>()?,
&ReprOptions::default(),
StructKind::AlwaysSized, StructKind::AlwaysSized,
)? )?
} }
@ -438,7 +424,6 @@ fn layout_of_uncached<'tcx>(
let tys = args.as_coroutine_closure().upvar_tys(); let tys = args.as_coroutine_closure().upvar_tys();
univariant( univariant(
&tys.iter().map(|ty| cx.layout_of(ty)).try_collect::<IndexVec<_, _>>()?, &tys.iter().map(|ty| cx.layout_of(ty)).try_collect::<IndexVec<_, _>>()?,
&ReprOptions::default(),
StructKind::AlwaysSized, StructKind::AlwaysSized,
)? )?
} }
@ -447,11 +432,7 @@ fn layout_of_uncached<'tcx>(
let kind = let kind =
if tys.len() == 0 { StructKind::AlwaysSized } else { StructKind::MaybeUnsized }; if tys.len() == 0 { StructKind::AlwaysSized } else { StructKind::MaybeUnsized };
univariant( univariant(&tys.iter().map(|k| cx.layout_of(k)).try_collect::<IndexVec<_, _>>()?, kind)?
&tys.iter().map(|k| cx.layout_of(k)).try_collect::<IndexVec<_, _>>()?,
&ReprOptions::default(),
kind,
)?
} }
// SIMD vector types. // SIMD vector types.
@ -902,13 +883,7 @@ fn coroutine_layout<'tcx>(
.chain(iter::once(Ok(tag_layout))) .chain(iter::once(Ok(tag_layout)))
.chain(promoted_layouts) .chain(promoted_layouts)
.try_collect::<IndexVec<_, _>>()?; .try_collect::<IndexVec<_, _>>()?;
let prefix = univariant_uninterned( let prefix = univariant_uninterned(cx, ty, &prefix_layouts, StructKind::AlwaysSized)?;
cx,
ty,
&prefix_layouts,
&ReprOptions::default(),
StructKind::AlwaysSized,
)?;
let (prefix_size, prefix_align) = (prefix.size, prefix.align); let (prefix_size, prefix_align) = (prefix.size, prefix.align);
@ -973,7 +948,6 @@ fn coroutine_layout<'tcx>(
cx, cx,
ty, ty,
&variant_only_tys.map(|ty| cx.layout_of(ty)).try_collect::<IndexVec<_, _>>()?, &variant_only_tys.map(|ty| cx.layout_of(ty)).try_collect::<IndexVec<_, _>>()?,
&ReprOptions::default(),
StructKind::Prefixed(prefix_size, prefix_align.abi), StructKind::Prefixed(prefix_size, prefix_align.abi),
)?; )?;
variant.variants = Variants::Single { index }; variant.variants = Variants::Single { index };