bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Added additional visit steps to visit_generic_param() in order to avoid ICE on no bound vars.

Browse source
This commit is contained in:
Lenko Donchev 2023-07-05 20:19:14 -05:00
parent 91958e0a74
commit a1d181d740
3 changed files with 53 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

31
compiler/rustc_hir_analysis/src/collect/resolve_bound_vars.rs
View file

@ -856,22 +856,6 @@ impl<'a, 'tcx> Visitor<'tcx> for BoundVarContext<'a, 'tcx> {
let scope = Scope::TraitRefBoundary { s: self.scope };
self.with(scope, |this| {
walk_list!(this, visit_generic_param, generics.params);
for param in generics.params {
match param.kind {
GenericParamKind::Lifetime { .. } => {}
GenericParamKind::Type { default, .. } => {
if let Some(ty) = default {
this.visit_ty(ty);
}
}
GenericParamKind::Const { ty, default } => {
this.visit_ty(ty);
if let Some(default) = default {
this.visit_body(this.tcx.hir().body(default.body));
}
}
}
}
walk_list!(this, visit_where_predicate, generics.predicates);
})
}
@ -1000,6 +984,21 @@ impl<'a, 'tcx> Visitor<'tcx> for BoundVarContext<'a, 'tcx> {
// like implicit `?Sized` or const-param-has-ty predicates.
}
}
match p.kind {
GenericParamKind::Lifetime { .. } => {}
GenericParamKind::Type { default, .. } => {
if let Some(ty) = default {
self.visit_ty(ty);
}
}
GenericParamKind::Const { ty, default } => {
self.visit_ty(ty);
if let Some(default) = default {
self.visit_body(self.tcx.hir().body(default.body));
}
}
}
}
}