Propagate all early lifetime resolution errors to RBV

Author: eggyal

compiler/rustc_ast_lowering/src/lib.rs

@@ -878,7 +878,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
 
                 (hir::ParamName::Fresh, hir::LifetimeParamKind::Elided(kind))
             }
-            LifetimeRes::Static { .. } | LifetimeRes::Error { .. } => return None,
+            LifetimeRes::Static { .. } | LifetimeRes::Error(..) => return None,
             res => panic!(
                 "Unexpected lifetime resolution {:?} for {:?} at {:?}",
                 res, ident, ident.span
@@ -1932,27 +1932,29 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
         syntax: LifetimeSyntax,
     ) -> &'hir hir::Lifetime {
         let res =
-            self.resolver.get_lifetime_res(id).unwrap_or(LifetimeRes::Error { undeclared: None });
-        let res = match res {
-            LifetimeRes::Param { param, .. } => hir::LifetimeKind::Param(param),
-            LifetimeRes::Fresh { param, .. } => {
-                assert_eq!(ident.name, kw::UnderscoreLifetime);
-                let param = self.local_def_id(param);
-                hir::LifetimeKind::Param(param)
-            }
-            LifetimeRes::Infer => {
-                assert_eq!(ident.name, kw::UnderscoreLifetime);
-                hir::LifetimeKind::Infer
-            }
-            LifetimeRes::Static { .. } => {
-                assert!(matches!(ident.name, kw::StaticLifetime | kw::UnderscoreLifetime));
-                hir::LifetimeKind::Static
-            }
-            LifetimeRes::Error { undeclared } => hir::LifetimeKind::Error { undeclared },
-            LifetimeRes::ElidedAnchor { .. } => {
-                panic!("Unexpected `ElidedAnchar` {:?} at {:?}", ident, ident.span);
-            }
-        };
+            self.resolver.get_lifetime_res(id).map_or(
+                hir::LifetimeKind::NotFound,
+                |res| match res {
+                    LifetimeRes::Param { param, .. } => hir::LifetimeKind::Param(param),
+                    LifetimeRes::Fresh { param, .. } => {
+                        assert_eq!(ident.name, kw::UnderscoreLifetime);
+                        let param = self.local_def_id(param);
+                        hir::LifetimeKind::Param(param)
+                    }
+                    LifetimeRes::Infer => {
+                        assert_eq!(ident.name, kw::UnderscoreLifetime);
+                        hir::LifetimeKind::Infer
+                    }
+                    LifetimeRes::Static { .. } => {
+                        assert!(matches!(ident.name, kw::StaticLifetime | kw::UnderscoreLifetime));
+                        hir::LifetimeKind::Static
+                    }
+                    LifetimeRes::Error(guar) => hir::LifetimeKind::Error(guar),
+                    LifetimeRes::ElidedAnchor { .. } => {
+                        panic!("Unexpected `ElidedAnchar` {:?} at {:?}", ident, ident.span);
+                    }
+                },
+            );
 
         debug!(?res);
         self.arena.alloc(hir::Lifetime::new(
@@ -2015,7 +2017,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
                 // AST resolution emitted an error on those parameters, so we lower them using
                 // `ParamName::Error`.
                 let ident = self.lower_ident(param.ident);
-                let param_name = if let Some(LifetimeRes::Error { .. }) =
+                let param_name = if let Some(LifetimeRes::Error(..)) =
                     self.resolver.get_lifetime_res(param.id)
                 {
                     ParamName::Error(ident)

compiler/rustc_hir/src/def.rs

@@ -990,7 +990,7 @@ pub enum LifetimeRes {
     /// `'static` lifetime.
     Static,
     /// Resolution failure.
-    Error { undeclared: Option<rustc_span::ErrorGuaranteed> },
+    Error(rustc_span::ErrorGuaranteed),
     /// HACK: This is used to recover the NodeId of an elided lifetime.
     ElidedAnchor { start: NodeId, end: NodeId },
 }

compiler/rustc_hir/src/hir.rs

@@ -238,7 +238,8 @@ pub enum LifetimeKind {
 
     /// Indicates an error during lowering (usually `'_` in wrong place)
     /// that was already reported.
-    Error { undeclared: Option<ErrorGuaranteed> },
+    Error(ErrorGuaranteed),
+    NotFound,
 
     /// User wrote an anonymous lifetime, either `'_` or nothing (which gets
     /// converted to `'_`). The semantics of this lifetime should be inferred
@@ -258,7 +259,10 @@ impl LifetimeKind {
             // -- but this is because, as far as the code in the compiler is
             // concerned -- `Fresh` variants act equivalently to "some fresh name".
             // They correspond to early-bound regions on an impl, in other words.
-            LifetimeKind::Error { .. } | LifetimeKind::Param(..) | LifetimeKind::Static => false,
+            LifetimeKind::Error(..)
+            | LifetimeKind::NotFound
+            | LifetimeKind::Param(..)
+            | LifetimeKind::Static => false,
         }
     }
 }

compiler/rustc_hir_analysis/src/collect/resolve_bound_vars.rs

@@ -663,7 +663,7 @@ impl<'a, 'tcx> Visitor<'tcx> for BoundVarContext<'a, 'tcx> {
                 LifetimeKind::Param(def_id) => {
                     self.resolve_lifetime_ref(def_id, lt);
                 }
-                LifetimeKind::Error { .. } => {}
+                LifetimeKind::Error(..) | LifetimeKind::NotFound => {}
                 LifetimeKind::ImplicitObjectLifetimeDefault
                 | LifetimeKind::Infer
                 | LifetimeKind::Static => {
@@ -804,7 +804,7 @@ impl<'a, 'tcx> Visitor<'tcx> for BoundVarContext<'a, 'tcx> {
                         // If the user wrote an explicit name, use that.
                         self.visit_lifetime(&*lifetime);
                     }
-                    LifetimeKind::Error { .. } => {}
+                    LifetimeKind::Error(..) | LifetimeKind::NotFound => {}
                 }
             }
             hir::TyKind::Ref(lifetime_ref, ref mt) => {
@@ -891,9 +891,10 @@ impl<'a, 'tcx> Visitor<'tcx> for BoundVarContext<'a, 'tcx> {
             hir::LifetimeKind::Param(param_def_id) => {
                 self.resolve_lifetime_ref(param_def_id, lifetime_ref)
             }
-            // If we've already reported an error, just ignore `lifetime_ref`.
-            hir::LifetimeKind::Error { undeclared: None } => {}
-            hir::LifetimeKind::Error { undeclared: Some(guar) } => {
+            // Just ignore `lifetime_ref` if it couldn't be resolved
+            hir::LifetimeKind::NotFound => {}
+            // Keep track of lifetimes about which errors have already been reported
+            hir::LifetimeKind::Error(guar) => {
                 self.insert_lifetime(lifetime_ref, ResolvedArg::Error(guar))
             }
             // Those will be resolved by typechecking.

compiler/rustc_hir_analysis/src/hir_ty_lowering/dyn_trait.rs

@@ -451,17 +451,7 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
                 } else {
                     let reason =
                         if let hir::LifetimeKind::ImplicitObjectLifetimeDefault = lifetime.kind {
-                            if let hir::Node::Ty(hir::Ty {
-                                kind: hir::TyKind::Ref(parent_lifetime, _),
-                                ..
-                            }) = tcx.parent_hir_node(hir_id)
-                                && tcx.named_bound_var(parent_lifetime.hir_id).is_none()
-                            {
-                                // Parent lifetime must have failed to resolve. Don't emit a redundant error.
-                                RegionInferReason::ExplicitObjectLifetime
-                            } else {
-                                RegionInferReason::ObjectLifetimeDefault
-                            }
+                            RegionInferReason::ObjectLifetimeDefault
                         } else {
                             RegionInferReason::ExplicitObjectLifetime
                         };