Fix: Prevent macro-expanded extern crates from shadowing extern arguments

Delta17920 · Delta17920 · commit aad4fc9fcd73 · 2025-12-11T16:13:39.000Z
diff --git a/compiler/rustc_resolve/src/build_reduced_graph.rs b/compiler/rustc_resolve/src/build_reduced_graph.rs
@@ -1036,6 +1036,7 @@ impl<'a, 'ra, 'tcx> BuildReducedGraphVisitor<'a, 'ra, 'tcx> {
                 self.r.dcx().emit_err(
                     errors::MacroExpandedExternCrateCannotShadowExternArguments { span: item.span },
                 );
+                return; // Fix: Stop processing this item to avoid inconsistent resolution state.
             }
 
             use indexmap::map::Entry;
diff --git a/compiler/rustc_resolve/src/ident.rs b/compiler/rustc_resolve/src/ident.rs
@@ -771,36 +771,39 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
         } else {
             None
         };
-        // Skip ambiguity errors for extern flag bindings "overridden"
-        // by extern item bindings.
-        // FIXME: Remove with lang team approval.
-        let issue_145575_hack = Some(binding) == extern_prelude_flag_binding
-            && extern_prelude_item_binding.is_some()
-            && extern_prelude_item_binding != Some(innermost_binding);
-        if let Some(kind) = ambiguity_error_kind
-            && !issue_145575_hack
-        {
-            let misc = |f: Flags| {
-                if f.contains(Flags::MISC_SUGGEST_CRATE) {
-                    AmbiguityErrorMisc::SuggestCrate
-                } else if f.contains(Flags::MISC_SUGGEST_SELF) {
-                    AmbiguityErrorMisc::SuggestSelf
-                } else if f.contains(Flags::MISC_FROM_PRELUDE) {
-                    AmbiguityErrorMisc::FromPrelude
-                } else {
-                    AmbiguityErrorMisc::None
-                }
-            };
-            self.ambiguity_errors.push(AmbiguityError {
-                kind,
-                ident: orig_ident,
-                b1: innermost_binding,
-                b2: binding,
-                warning: false,
-                misc1: misc(innermost_flags),
-                misc2: misc(flags),
-            });
-            return true;
+        if let Some(kind) = ambiguity_error_kind {
+            // Skip ambiguity errors for extern flag bindings "overridden"
+            // by extern item bindings.
+            // FIXME: Remove with lang team approval.
+            let issue_145575_hack = Some(binding) == extern_prelude_flag_binding
+                && extern_prelude_item_binding.is_some()
+                && extern_prelude_item_binding != Some(innermost_binding);
+
+            if issue_145575_hack {
+                self.issue_145575_hack_applied = true;
+            } else {
+                let misc = |f: Flags| {
+                    if f.contains(Flags::MISC_SUGGEST_CRATE) {
+                        AmbiguityErrorMisc::SuggestCrate
+                    } else if f.contains(Flags::MISC_SUGGEST_SELF) {
+                        AmbiguityErrorMisc::SuggestSelf
+                    } else if f.contains(Flags::MISC_FROM_PRELUDE) {
+                        AmbiguityErrorMisc::FromPrelude
+                    } else {
+                        AmbiguityErrorMisc::None
+                    }
+                };
+                self.ambiguity_errors.push(AmbiguityError {
+                    kind,
+                    ident: orig_ident,
+                    b1: innermost_binding,
+                    b2: binding,
+                    warning: false,
+                    misc1: misc(innermost_flags),
+                    misc2: misc(flags),
+                });
+                return true;
+            }
         }
 
         false
diff --git a/compiler/rustc_resolve/src/imports.rs b/compiler/rustc_resolve/src/imports.rs
@@ -1170,7 +1170,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
                             return;
                         }
                         if let Some(initial_res) = initial_res {
-                            if res != initial_res {
+                            if res != initial_res && !this.issue_145575_hack_applied {
                                 span_bug!(import.span, "inconsistent resolution for an import");
                             }
                         } else if this.privacy_errors.is_empty() {
diff --git a/compiler/rustc_resolve/src/lib.rs b/compiler/rustc_resolve/src/lib.rs
@@ -1186,6 +1186,7 @@ pub struct Resolver<'ra, 'tcx> {
     privacy_errors: Vec<PrivacyError<'ra>> = Vec::new(),
     /// Ambiguity errors are delayed for deduplication.
     ambiguity_errors: Vec<AmbiguityError<'ra>> = Vec::new(),
+    issue_145575_hack_applied: bool = false,
     /// `use` injections are delayed for better placement and deduplication.
     use_injections: Vec<UseError<'tcx>> = Vec::new(),
     /// Crate-local macro expanded `macro_export` referred to by a module-relative path.
diff --git a/src/tools/clippy/tests/ui/crashes/ice-6255.rs b/src/tools/clippy/tests/ui/crashes/ice-6255.rs
@@ -9,7 +9,7 @@ macro_rules! define_other_core {
 }
 
 fn main() {
-    core::panic!(); //~ ERROR: `core` is ambiguous
+    core::panic!();
 }
 
 define_other_core!();
diff --git a/src/tools/clippy/tests/ui/crashes/ice-6255.stderr b/src/tools/clippy/tests/ui/crashes/ice-6255.stderr
@@ -9,25 +9,5 @@ LL | define_other_core!();
    |
    = note: this error originates in the macro `define_other_core` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error[E0659]: `core` is ambiguous
-  --> tests/ui/crashes/ice-6255.rs:12:5
-   |
-LL |     core::panic!();
-   |     ^^^^ ambiguous name
-   |
-   = note: ambiguous because of a conflict between a macro-expanded name and a less macro-expanded name from outer scope during import or macro resolution
-   = note: `core` could refer to a built-in crate
-note: `core` could also refer to the crate imported here
-  --> tests/ui/crashes/ice-6255.rs:6:9
-   |
-LL |         extern crate std as core;
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^
-...
-LL | define_other_core!();
-   | -------------------- in this macro invocation
-   = help: use `crate::core` to refer to this crate unambiguously
-   = note: this error originates in the macro `define_other_core` (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: aborting due to 2 previous errors
+error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0659`.
diff --git a/tests/ui/imports/issue-109148.rs b/tests/ui/imports/issue-109148.rs
@@ -10,7 +10,7 @@ macro_rules! m {
 
 m!();
 
-use std::mem; //~ ERROR `std` is ambiguous
-use ::std::mem as _; //~ ERROR `std` is ambiguous
+use std::mem;
+use ::std::mem as _;
 
 fn main() {}
diff --git a/tests/ui/imports/issue-109148.stderr b/tests/ui/imports/issue-109148.stderr
@@ -9,43 +9,5 @@ LL | m!();
    |
    = note: this error originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error[E0659]: `std` is ambiguous
-  --> $DIR/issue-109148.rs:13:5
-   |
-LL | use std::mem;
-   |     ^^^ ambiguous name
-   |
-   = note: ambiguous because of a conflict between a macro-expanded name and a less macro-expanded name from outer scope during import or macro resolution
-   = note: `std` could refer to a built-in crate
-note: `std` could also refer to the crate imported here
-  --> $DIR/issue-109148.rs:6:9
-   |
-LL |         extern crate core as std;
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^
-...
-LL | m!();
-   | ---- in this macro invocation
-   = help: use `crate::std` to refer to this crate unambiguously
-   = note: this error originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0659]: `std` is ambiguous
-  --> $DIR/issue-109148.rs:14:7
-   |
-LL | use ::std::mem as _;
-   |       ^^^ ambiguous name
-   |
-   = note: ambiguous because of a conflict between a macro-expanded name and a less macro-expanded name from outer scope during import or macro resolution
-   = note: `std` could refer to a built-in crate
-note: `std` could also refer to the crate imported here
-  --> $DIR/issue-109148.rs:6:9
-   |
-LL |         extern crate core as std;
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^
-...
-LL | m!();
-   | ---- in this macro invocation
-   = note: this error originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: aborting due to 3 previous errors
+error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0659`.
diff --git a/tests/ui/macros/issue-78325-inconsistent-resolution.rs b/tests/ui/macros/issue-78325-inconsistent-resolution.rs
@@ -8,8 +8,8 @@ macro_rules! define_other_core {
 }
 
 fn main() {
-    core::panic!(); //~ ERROR `core` is ambiguous
-    ::core::panic!(); //~ ERROR `core` is ambiguous
+    core::panic!();
+    ::core::panic!();
 }
 
 define_other_core!();
diff --git a/tests/ui/macros/issue-78325-inconsistent-resolution.stderr b/tests/ui/macros/issue-78325-inconsistent-resolution.stderr
@@ -9,43 +9,5 @@ LL | define_other_core!();
    |
    = note: this error originates in the macro `define_other_core` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error[E0659]: `core` is ambiguous
-  --> $DIR/issue-78325-inconsistent-resolution.rs:11:5
-   |
-LL |     core::panic!();
-   |     ^^^^ ambiguous name
-   |
-   = note: ambiguous because of a conflict between a macro-expanded name and a less macro-expanded name from outer scope during import or macro resolution
-   = note: `core` could refer to a built-in crate
-note: `core` could also refer to the crate imported here
-  --> $DIR/issue-78325-inconsistent-resolution.rs:5:9
-   |
-LL |         extern crate std as core;
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^
-...
-LL | define_other_core!();
-   | -------------------- in this macro invocation
-   = help: use `crate::core` to refer to this crate unambiguously
-   = note: this error originates in the macro `define_other_core` (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error[E0659]: `core` is ambiguous
-  --> $DIR/issue-78325-inconsistent-resolution.rs:12:7
-   |
-LL |     ::core::panic!();
-   |       ^^^^ ambiguous name
-   |
-   = note: ambiguous because of a conflict between a macro-expanded name and a less macro-expanded name from outer scope during import or macro resolution
-   = note: `core` could refer to a built-in crate
-note: `core` could also refer to the crate imported here
-  --> $DIR/issue-78325-inconsistent-resolution.rs:5:9
-   |
-LL |         extern crate std as core;
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^
-...
-LL | define_other_core!();
-   | -------------------- in this macro invocation
-   = note: this error originates in the macro `define_other_core` (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: aborting due to 3 previous errors
+error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0659`.
diff --git a/tests/ui/resolve/ice-inconsistent-resolution-149821.rs b/tests/ui/resolve/ice-inconsistent-resolution-149821.rs
@@ -0,0 +1,17 @@
+//@ edition: 2024
+
+mod m {
+    use crate::*;
+    use core;
+}
+
+macro_rules! define_other_core {
+    () => {
+        extern crate std as core;
+        //~^ ERROR macro-expanded `extern crate` items cannot shadow names passed with `--extern`
+    };
+}
+
+define_other_core! {}
+
+fn main() {}
diff --git a/tests/ui/resolve/ice-inconsistent-resolution-149821.stderr b/tests/ui/resolve/ice-inconsistent-resolution-149821.stderr
@@ -0,0 +1,13 @@
+error: macro-expanded `extern crate` items cannot shadow names passed with `--extern`
+  --> $DIR/ice-inconsistent-resolution-149821.rs:10:9
+   |
+LL |         extern crate std as core;
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^
+...
+LL | define_other_core! {}
+   | --------------------- in this macro invocation
+   |
+   = note: this error originates in the macro `define_other_core` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: aborting due to 1 previous error
+

Original file line number	Diff line number	Diff line change
`@@ -1036,6 +1036,7 @@ impl<'a, 'ra, 'tcx> BuildReducedGraphVisitor<'a, 'ra, 'tcx> {`
`1036`	`1036`	`self.r.dcx().emit_err(`
`1037`	`1037`	`errors::MacroExpandedExternCrateCannotShadowExternArguments { span: item.span },`
`1038`	`1038`	`);`
	`1039`	`+ return; // Fix: Stop processing this item to avoid inconsistent resolution state.`
`1039`	`1040`	`}`
`1040`	`1041`
`1041`	`1042`	`use indexmap::map::Entry;`
Original file line number	Diff line number	Diff line change
`@@ -1170,7 +1170,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {`
`1170`	`1170`	`return;`
`1171`	`1171`	`}`
`1172`	`1172`	`if let Some(initial_res) = initial_res {`
`1173`		`- if res != initial_res {`
	`1173`	`+ if res != initial_res && !this.issue_145575_hack_applied {`
`1174`	`1174`	`span_bug!(import.span, "inconsistent resolution for an import");`
`1175`	`1175`	`}`
`1176`	`1176`	`} else if this.privacy_errors.is_empty() {`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ macro_rules! define_other_core {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`fn main() {`
`12`		- core::panic!(); //~ ERROR: `core` is ambiguous
	`12`	`+ core::panic!();`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`define_other_core!();`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ macro_rules! define_other_core {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`fn main() {`
`11`		- core::panic!(); //~ ERROR `core` is ambiguous
`12`		- ::core::panic!(); //~ ERROR `core` is ambiguous
	`11`	`+ core::panic!();`
	`12`	`+ ::core::panic!();`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`define_other_core!();`