Attempt to be more precise when looking for poinsoned module

Author: ogoffart

compiler/rustc_resolve/src/ident.rs

@@ -1835,6 +1835,14 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
             }
 
             let binding = if let Some(module) = module {
+                if !self.mods_with_parse_errors.is_empty()
+                    && let ModuleOrUniformRoot::Module(m) = module
+                    && m.res()
+                        .and_then(|r| r.module_like_def_id())
+                        .is_some_and(|def_id| self.mods_with_parse_errors.contains(&def_id))
+                {
+                    module_had_parse_errors = true;
+                }
                 self.reborrow().resolve_ident_in_module(
                     module,
                     ident,
@@ -1867,7 +1875,19 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
                             path.len() - 1,
                         ));
                     }
-                    _ => Err(Determinacy::determined(finalize.is_some())),
+                    _ => {
+                        for rib in &ribs[ns] {
+                            if let RibKind::Module(module) = rib.kind
+                                && module.res().and_then(|r| r.module_like_def_id()).is_some_and(
+                                    |def_id| self.mods_with_parse_errors.contains(&def_id),
+                                )
+                            {
+                                module_had_parse_errors = true;
+                                break;
+                            }
+                        }
+                        Err(Determinacy::determined(finalize.is_some()))
+                    }
                 }
             } else {
                 self.reborrow().resolve_ident_in_scope_set(
@@ -1904,9 +1924,6 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
 
                     let maybe_assoc = opt_ns != Some(MacroNS) && PathSource::Type.is_expected(res);
                     if let Some(def_id) = binding.res().module_like_def_id() {
-                        if self.mods_with_parse_errors.contains(&def_id) {
-                            module_had_parse_errors = true;
-                        }
                         module = Some(ModuleOrUniformRoot::Module(self.expect_module(def_id)));
                         record_segment_res(self.reborrow(), finalize, res, id);
                     } else if res == Res::ToolMod && !is_last && opt_ns.is_some() {

tests/ui/macros/compile_error_macro-suppress-errors.rs

@@ -1,13 +1,28 @@
-mod some_module {
+pub mod some_module {
     compile_error!("Error in a module"); //~ ERROR: Error in a module
 
-    fn abc() {
+    fn abc() -> Hello {
         let _: self::SomeType = self::Hello::new();
         let _: SomeType = Hello::new();
     }
+
+    mod inner_module {
+        use super::Hello;
+        use crate::another_module::NotExist;  //~ ERROR: unresolved import `crate::another_module::NotExist`
+        use crate::some_module::World;
+        struct Foo {
+            bar: super::Xyz,
+            error: self::MissingType, //~ ERROR: cannot find type `MissingType` in module `self`
+        }
+    }
 }
 
-mod another_module {}
+pub mod another_module {
+    use crate::some_module::NotExist;
+    fn error_in_this_function() {
+        compile_error!("Error in a function"); //~ ERROR: Error in a function
+    }
+}
 
 fn main() {
     // these errors are suppressed because of the compile_error! macro

tests/ui/macros/compile_error_macro-suppress-errors.stderr

@@ -4,25 +4,43 @@ error: Error in a module
 LL |     compile_error!("Error in a module");
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+error: Error in a function
+  --> $DIR/compile_error_macro-suppress-errors.rs:23:9
+   |
+LL |         compile_error!("Error in a function");
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0432]: unresolved import `crate::another_module::NotExist`
+  --> $DIR/compile_error_macro-suppress-errors.rs:11:13
+   |
+LL |         use crate::another_module::NotExist;
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no `NotExist` in `another_module`
+
 error[E0433]: failed to resolve: could not find `Hello` in `another_module`
-  --> $DIR/compile_error_macro-suppress-errors.rs:22:55
+  --> $DIR/compile_error_macro-suppress-errors.rs:37:55
    |
 LL |     let _: another_module::SomeType = another_module::Hello::new();
    |                                                       ^^^^^ could not find `Hello` in `another_module`
 
+error[E0412]: cannot find type `MissingType` in module `self`
+  --> $DIR/compile_error_macro-suppress-errors.rs:15:26
+   |
+LL |             error: self::MissingType,
+   |                          ^^^^^^^^^^^ not found in `self`
+
 error[E0425]: cannot find function `some_function` in module `another_module`
-  --> $DIR/compile_error_macro-suppress-errors.rs:20:29
+  --> $DIR/compile_error_macro-suppress-errors.rs:35:29
    |
 LL |     let _ = another_module::some_function();
    |                             ^^^^^^^^^^^^^ not found in `another_module`
 
 error[E0412]: cannot find type `SomeType` in module `another_module`
-  --> $DIR/compile_error_macro-suppress-errors.rs:22:28
+  --> $DIR/compile_error_macro-suppress-errors.rs:37:28
    |
 LL |     let _: another_module::SomeType = another_module::Hello::new();
    |                            ^^^^^^^^ not found in `another_module`
 
-error: aborting due to 4 previous errors
+error: aborting due to 7 previous errors
 
-Some errors have detailed explanations: E0412, E0425, E0433.
+Some errors have detailed explanations: E0412, E0425, E0432, E0433.
 For more information about an error, try `rustc --explain E0412`.