Move extra_lifetime_params_map to per-owner tables

Author: oli-obk

Diff for: compiler/rustc_ast_lowering/src/lib.rs

@@ -272,7 +272,16 @@ impl PerOwnerResolver<'_> {
     /// The extra lifetimes that appear from the parenthesized `Fn`-trait desugaring
     /// should appear at the enclosing `PolyTraitRef`.
     fn extra_lifetime_params(&self, id: NodeId) -> Vec<(Ident, NodeId, LifetimeRes)> {
-        self.general.extra_lifetime_params_map.get(&id).cloned().unwrap_or_default()
+        let res = self.item.extra_lifetime_params_map.get(&id).cloned().unwrap_or_default();
+        if res.is_empty() {
+            self.general.owners.items().any(|(_, data)| {
+                if data.extra_lifetime_params_map.contains_key(&id) {
+                    panic!("found {id} in {} instead of {}", data.id, self.item.id);
+                }
+                false
+            });
+        }
+        res
     }
 }
 
@@ -655,7 +664,8 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
         self.item_local_id_counter = current_local_counter;
         self.impl_trait_defs = current_impl_trait_defs;
         self.impl_trait_bounds = current_impl_trait_bounds;
-        self.resolver.item = current_item_resolver;
+        let reinsert = std::mem::replace(&mut self.resolver.item, current_item_resolver);
+        self.resolver.general.owners.insert(owner, reinsert);
 
         debug_assert!(!self.children.iter().any(|(id, _)| id == &owner_id.def_id));
         self.children.push((owner_id.def_id, hir::MaybeOwner::Owner(info)));

Diff for: compiler/rustc_middle/src/ty/mod.rs

@@ -197,6 +197,8 @@ pub struct PerOwnerResolverData {
     pub lifetime_elision_allowed: FxHashSet<ast::NodeId>,
     /// Resolutions for lifetimes.
     pub lifetimes_res_map: NodeMap<LifetimeRes>,
+    /// Lifetime parameters that lowering will have to introduce.
+    pub extra_lifetime_params_map: NodeMap<Vec<(Ident, ast::NodeId, LifetimeRes)>>,
 
     pub trait_map: NodeMap<Vec<hir::TraitCandidate>>,
     /// The id of the owner
@@ -213,6 +215,7 @@ impl PerOwnerResolverData {
             lifetime_elision_allowed: Default::default(),
             trait_map: Default::default(),
             lifetimes_res_map: Default::default(),
+            extra_lifetime_params_map: Default::default(),
         }
     }
 }
@@ -225,8 +228,6 @@ pub struct ResolverAstLowering {
     pub partial_res_map: NodeMap<hir::def::PartialRes>,
     /// Resolutions for import nodes, which have multiple resolutions in different namespaces.
     pub import_res_map: NodeMap<hir::def::PerNS<Option<Res<ast::NodeId>>>>,
-    /// Lifetime parameters that lowering will have to introduce.
-    pub extra_lifetime_params_map: NodeMap<Vec<(Ident, ast::NodeId, LifetimeRes)>>,
 
     pub owners: NodeMap<PerOwnerResolverData>,
 

Diff for: compiler/rustc_resolve/src/late.rs

@@ -1816,9 +1816,10 @@ impl<'a, 'ast, 'ra: 'ast, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
                         lifetimes_in_scope.extend(rib.bindings.iter().map(|(ident, _)| ident.span));
                         // Consider any anonymous lifetimes, too
                         if let LifetimeRibKind::AnonymousCreateParameter { binder, .. } = rib.kind
-                            && let Some(extra) = self.r.extra_lifetime_params_map.get(&binder)
+                            && let Some(extra) =
+                                self.r.extra_diagnostics_lifetime_params_map.get(&binder)
                         {
-                            lifetimes_in_scope.extend(extra.iter().map(|(ident, _, _)| ident.span));
+                            lifetimes_in_scope.extend(extra.iter());
                         }
                         if let LifetimeRibKind::Item = rib.kind {
                             break;
@@ -1953,6 +1954,11 @@ impl<'a, 'ast, 'ra: 'ast, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
             .entry(binder)
             .or_insert_with(Vec::new)
             .push((ident, param, res));
+        self.r
+            .extra_diagnostics_lifetime_params_map
+            .entry(binder)
+            .or_insert_with(Vec::new)
+            .push(ident.span);
         res
     }
 

Diff for: compiler/rustc_resolve/src/lib.rs

@@ -51,9 +51,7 @@ use rustc_errors::{Applicability, Diag, ErrCode, ErrorGuaranteed};
 use rustc_expand::base::{DeriveResolution, SyntaxExtension, SyntaxExtensionKind};
 use rustc_feature::BUILTIN_ATTRIBUTES;
 use rustc_hir::def::Namespace::{self, *};
-use rustc_hir::def::{
-    self, CtorOf, DefKind, DocLinkResMap, LifetimeRes, NonMacroAttrKind, PartialRes, PerNS,
-};
+use rustc_hir::def::{self, CtorOf, DefKind, DocLinkResMap, NonMacroAttrKind, PartialRes, PerNS};
 use rustc_hir::def_id::{CRATE_DEF_ID, CrateNum, DefId, LOCAL_CRATE, LocalDefId, LocalDefIdMap};
 use rustc_hir::{PrimTy, TraitCandidate};
 use rustc_index::IndexVec;
@@ -1073,8 +1071,8 @@ pub struct Resolver<'ra, 'tcx> {
     import_res_map: NodeMap<PerNS<Option<Res>>>,
     /// An import will be inserted into this map if it has been used.
     import_use_map: FxHashMap<Import<'ra>, Used>,
-    /// Lifetime parameters that lowering will have to introduce.
-    extra_lifetime_params_map: NodeMap<Vec<(Ident, NodeId, LifetimeRes)>>,
+    /// Lifetimes that have no AST that got generated on the fly.
+    extra_diagnostics_lifetime_params_map: NodeMap<Vec<Span>>,
 
     /// `CrateNum` resolutions of `extern crate` items.
     extern_crate_map: UnordMap<LocalDefId, CrateNum>,
@@ -1492,7 +1490,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
             partial_res_map: Default::default(),
             import_res_map: Default::default(),
             import_use_map: Default::default(),
-            extra_lifetime_params_map: Default::default(),
+            extra_diagnostics_lifetime_params_map: Default::default(),
             extern_crate_map: Default::default(),
             module_children: Default::default(),
             underscore_disambiguator: 0,
@@ -1694,7 +1692,6 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
             owners: self.owners,
             partial_res_map: self.partial_res_map,
             import_res_map: self.import_res_map,
-            extra_lifetime_params_map: self.extra_lifetime_params_map,
             next_node_id: self.next_node_id,
             lint_buffer: Steal::new(self.lint_buffer),
             delegation_fn_sigs: self.delegation_fn_sigs,

Diff for: compiler/rustc_resolve/src/macros.rs

@@ -526,13 +526,15 @@ impl<'ra, 'tcx> ResolverExpand for Resolver<'ra, 'tcx> {
                     lifetime_elision_allowed,
                     trait_map,
                     lifetimes_res_map,
+                    extra_lifetime_params_map,
                 } = old;
                 assert!(node_id_to_def_id.is_empty());
                 assert!(legacy_const_generic_args.is_empty());
                 assert!(label_res_map.is_empty());
                 assert!(lifetime_elision_allowed.is_empty());
                 assert!(trait_map.is_empty());
                 assert!(lifetimes_res_map.is_empty());
+                assert!(extra_lifetime_params_map.is_empty());
             }
         } else {
             assert!(self.owners.insert(old.id, old).is_none());