Auto merge of #57181 - petrochenkov:impice3, r=estebank
resolve: Fix another ICE in import validation Imports are allowed to have ambiguous resolutions as long as all of them have same `Def`. As it turned out, it's possible for different `Module`s to have same `Def` when `extern crate` items are involved. Fixes https://github.com/rust-lang/rust/issues/56596
This commit is contained in:
commit
419044956a
|
@ -1014,11 +1014,11 @@ enum ModuleOrUniformRoot<'a> {
|
||||||
CurrentScope,
|
CurrentScope,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a> PartialEq for ModuleOrUniformRoot<'a> {
|
impl ModuleOrUniformRoot<'_> {
|
||||||
fn eq(&self, other: &Self) -> bool {
|
fn same_def(lhs: Self, rhs: Self) -> bool {
|
||||||
match (*self, *other) {
|
match (lhs, rhs) {
|
||||||
(ModuleOrUniformRoot::Module(lhs),
|
(ModuleOrUniformRoot::Module(lhs),
|
||||||
ModuleOrUniformRoot::Module(rhs)) => ptr::eq(lhs, rhs),
|
ModuleOrUniformRoot::Module(rhs)) => lhs.def() == rhs.def(),
|
||||||
(ModuleOrUniformRoot::CrateRootAndExternPrelude,
|
(ModuleOrUniformRoot::CrateRootAndExternPrelude,
|
||||||
ModuleOrUniformRoot::CrateRootAndExternPrelude) |
|
ModuleOrUniformRoot::CrateRootAndExternPrelude) |
|
||||||
(ModuleOrUniformRoot::ExternPrelude, ModuleOrUniformRoot::ExternPrelude) |
|
(ModuleOrUniformRoot::ExternPrelude, ModuleOrUniformRoot::ExternPrelude) |
|
||||||
|
|
|
@ -848,7 +848,7 @@ impl<'a, 'b:'a> ImportResolver<'a, 'b> {
|
||||||
PathResult::Module(module) => {
|
PathResult::Module(module) => {
|
||||||
// Consistency checks, analogous to `finalize_current_module_macro_resolutions`.
|
// Consistency checks, analogous to `finalize_current_module_macro_resolutions`.
|
||||||
if let Some(initial_module) = directive.imported_module.get() {
|
if let Some(initial_module) = directive.imported_module.get() {
|
||||||
if module != initial_module && no_ambiguity {
|
if !ModuleOrUniformRoot::same_def(module, initial_module) && no_ambiguity {
|
||||||
span_bug!(directive.span, "inconsistent resolution for an import");
|
span_bug!(directive.span, "inconsistent resolution for an import");
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
pub extern crate core;
|
|
@ -0,0 +1,11 @@
|
||||||
|
// compile-pass
|
||||||
|
// edition:2018
|
||||||
|
// compile-flags: --extern issue_56596_2
|
||||||
|
// aux-build:issue-56596-2.rs
|
||||||
|
|
||||||
|
mod m {
|
||||||
|
use core::any;
|
||||||
|
pub use issue_56596_2::*;
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {}
|
Loading…
Reference in New Issue