bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #113980 - bvanjoi:fix-113953, r=petrochenkov

Browse source 
fix(resolve): skip panic when resolution is dummy

Fixes #113953

Skip the panic when the binding refers to a dummy node during the finalization.

r? `@petrochenkov`
This commit is contained in:
bors 2023-07-25 05:25:11 +00:00
commit 5b1dc9de77
3 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
compiler/rustc_resolve/src/imports.rs
View file

@ -989,14 +989,17 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
initial_binding.res()
});
let res = binding.res();
if res == Res::Err || !this.ambiguity_errors.is_empty() {
this.tcx
.sess
.delay_span_bug(import.span, "some error happened for an import");
return;
}
if let Ok(initial_res) = initial_res {
if res != initial_res && this.ambiguity_errors.is_empty() {
if res != initial_res {
span_bug!(import.span, "inconsistent resolution for an import");
}
} else if res != Res::Err
&& this.ambiguity_errors.is_empty()
&& this.privacy_errors.is_empty()
{
} else if this.privacy_errors.is_empty() {
this.tcx
.sess
.create_err(CannotDetermineImportResolution { span: import.span })