bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #103221 - TaKO8Ki:fix-103202, r=oli-obk

Browse source 
Fix `SelfVisitor::is_self_ty` ICE

Fixes #103202
This commit is contained in:
Matthias Krüger 2022-10-20 22:42:38 +02:00 • committed by GitHub
commit 7ee4b218a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_resolve/src/late.rs
View file

@ -1939,11 +1939,11 @@ impl<'a: 'ast, 'b, 'ast> LateResolutionVisitor<'a, 'b, 'ast> {
match ty.kind {
TyKind::ImplicitSelf => true,
TyKind::Path(None, _) => {
let path_res = self.r.partial_res_map[&ty.id].expect_full_res();
if let Res::SelfTyParam { .. } | Res::SelfTyAlias { .. } = path_res {
let path_res = self.r.partial_res_map[&ty.id].full_res();
if let Some(Res::SelfTyParam { .. } | Res::SelfTyAlias { .. }) = path_res {
return true;
}
Some(path_res) == self.impl_self
self.impl_self.is_some() && path_res == self.impl_self
}
_ => false,
}