bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

remove bound_type_of query; make type_of return EarlyBinder; change type_of in metadata

Browse source
This commit is contained in:
Kyle Matsuda 2023-02-07 01:29:48 -07:00
parent d822b97a27
commit c183110cc2
164 changed files with 325 additions and 380 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_symbol_mangling/src/legacy.rs
View file

@ -26,7 +26,7 @@ pub(super) fn mangle<'tcx>(
let key = tcx.def_key(ty_def_id);
match key.disambiguated_data.data {
DefPathData::TypeNs(_) | DefPathData::ValueNs(_) => {
instance_ty = tcx.bound_type_of(ty_def_id).subst_identity();
instance_ty = tcx.type_of(ty_def_id).subst_identity();
debug!(?instance_ty);
break;
}

4
compiler/rustc_symbol_mangling/src/typeid/typeid_itanium_cxx_abi.rs
View file

@ -696,13 +696,13 @@ fn transform_ty<'tcx>(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>, options: TransformTyOptio
let variant = adt_def.non_enum_variant();
let param_env = tcx.param_env(variant.def_id);
let field = variant.fields.iter().find(|field| {
let ty = tcx.bound_type_of(field.did).subst_identity();
let ty = tcx.type_of(field.did).subst_identity();
let is_zst =
tcx.layout_of(param_env.and(ty)).map_or(false, |layout| layout.is_zst());
!is_zst
});
if let Some(field) = field {
let ty0 = tcx.bound_type_of(field.did).subst(tcx, substs);
let ty0 = tcx.type_of(field.did).subst(tcx, substs);
// Generalize any repr(transparent) user-defined type that is either a pointer
// or reference, and either references itself or any other type that contains or
// references itself, to avoid a reference cycle.