bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

some more is_zst that should be is_1zst

Browse source
This commit is contained in:
Ralf Jung 2023-08-29 14:09:41 +02:00
parent 0b84f18b24
commit d1c4fe94c3
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_hir_analysis/src/coherence/builtin.rs
View file

@ -195,8 +195,8 @@ fn visit_implementation_of_dispatch_from_dyn(tcx: TyCtxt<'_>, impl_did: LocalDef
let ty_b = field.ty(tcx, args_b); let ty_b = field.ty(tcx, args_b);
if let Ok(layout) = tcx.layout_of(param_env.and(ty_a)) { if let Ok(layout) = tcx.layout_of(param_env.and(ty_a)) {
if layout.is_zst() && layout.align.abi.bytes() == 1 { if layout.is_1zst() {
// ignore ZST fields with alignment of 1 byte // ignore 1-ZST fields
return false; return false;
} }
} }

6
compiler/rustc_lint/src/types.rs
View file

@ -804,7 +804,7 @@ pub(crate) fn nonnull_optimization_guaranteed<'tcx>(
tcx.has_attr(def.did(), sym::rustc_nonnull_optimization_guaranteed) tcx.has_attr(def.did(), sym::rustc_nonnull_optimization_guaranteed)
} }
/// `repr(transparent)` structs can have a single non-ZST field, this function returns that /// `repr(transparent)` structs can have a single non-1-ZST field, this function returns that
/// field. /// field.
pub fn transparent_newtype_field<'a, 'tcx>( pub fn transparent_newtype_field<'a, 'tcx>(
tcx: TyCtxt<'tcx>, tcx: TyCtxt<'tcx>,
@ -813,8 +813,8 @@ pub fn transparent_newtype_field<'a, 'tcx>(
let param_env = tcx.param_env(variant.def_id); let param_env = tcx.param_env(variant.def_id);
variant.fields.iter().find(|field| { variant.fields.iter().find(|field| {
let field_ty = tcx.type_of(field.did).instantiate_identity(); let field_ty = tcx.type_of(field.did).instantiate_identity();
let is_zst = tcx.layout_of(param_env.and(field_ty)).is_ok_and(|layout| layout.is_zst()); let is_1zst = tcx.layout_of(param_env.and(field_ty)).is_ok_and(|layout| layout.is_1zst());
!is_zst !is_1zst
}) })
} }

4
compiler/rustc_ty_utils/src/abi.rs
View file

@ -592,13 +592,13 @@ fn make_thin_self_ptr<'tcx>(
for i in 0..fat_pointer_layout.fields.count() { for i in 0..fat_pointer_layout.fields.count() {
let field_layout = fat_pointer_layout.field(cx, i); let field_layout = fat_pointer_layout.field(cx, i);
if !field_layout.is_zst() { if !field_layout.is_1zst() {
fat_pointer_layout = field_layout; fat_pointer_layout = field_layout;
continue 'descend_newtypes; continue 'descend_newtypes;
} }
} }
bug!("receiver has no non-zero-sized fields {:?}", fat_pointer_layout); bug!("receiver has no non-1-ZST fields {:?}", fat_pointer_layout);
} }
fat_pointer_layout.ty fat_pointer_layout.ty

2
compiler/rustc_ty_utils/src/layout.rs
View file

@ -192,7 +192,7 @@ fn layout_of_uncached<'tcx>(
let metadata_layout = cx.layout_of(metadata_ty)?; let metadata_layout = cx.layout_of(metadata_ty)?;
// If the metadata is a 1-zst, then the pointer is thin. // If the metadata is a 1-zst, then the pointer is thin.
if metadata_layout.is_zst() && metadata_layout.align.abi.bytes() == 1 { if metadata_layout.is_1zst() {
return Ok(tcx.mk_layout(LayoutS::scalar(cx, data_ptr))); return Ok(tcx.mk_layout(LayoutS::scalar(cx, data_ptr)));
} }