bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fixes -Zpolymorphize for src/test/ui/const-generics/auxiliary/crayte.rs

Browse source
This commit is contained in:
Oli Scherer 2021-03-04 15:44:20 +00:00
parent 67a61b9a01
commit 29f4aa753f
1 changed files with 39 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

48
compiler/rustc_mir/src/monomorphize/polymorphize.rs
View file

@ -107,18 +107,48 @@ fn mark_used_by_default_parameters<'tcx>(
generics: &'tcx ty::Generics, generics: &'tcx ty::Generics,
unused_parameters: &mut FiniteBitSet<u32>, unused_parameters: &mut FiniteBitSet<u32>,
) { ) {
if !tcx.is_trait(def_id) && (tcx.is_closure(def_id) || tcx.type_of(def_id).is_generator()) { match tcx.def_kind(def_id) {
for param in &generics.params { DefKind::Closure | DefKind::Generator => {
debug!(?param, "(closure/gen)"); for param in &generics.params {
unused_parameters.clear(param.index); debug!(?param, "(closure/gen)");
}
} else {
for param in &generics.params {
debug!(?param, "(other)");
if let ty::GenericParamDefKind::Lifetime = param.kind {
unused_parameters.clear(param.index); unused_parameters.clear(param.index);
} }
} }
DefKind::Mod
| DefKind::Struct
| DefKind::Union
| DefKind::Enum
| DefKind::Variant
| DefKind::Trait
| DefKind::TyAlias
| DefKind::ForeignTy
| DefKind::TraitAlias
| DefKind::AssocTy
| DefKind::TyParam
| DefKind::Fn
| DefKind::Const
| DefKind::ConstParam
| DefKind::Static
| DefKind::Ctor(_, _)
| DefKind::AssocFn
| DefKind::AssocConst
| DefKind::Macro(_)
| DefKind::ExternCrate
| DefKind::Use
| DefKind::ForeignMod
| DefKind::AnonConst
| DefKind::OpaqueTy
| DefKind::Field
| DefKind::LifetimeParam
| DefKind::GlobalAsm
| DefKind::Impl => {
for param in &generics.params {
debug!(?param, "(other)");
if let ty::GenericParamDefKind::Lifetime = param.kind {
unused_parameters.clear(param.index);
}
}
}
} }
if let Some(parent) = generics.parent { if let Some(parent) = generics.parent {