Move lifetimes_res_map to per-owner tables

Author: oli-obk

compiler/rustc_ast_lowering/src/lib.rs

@@ -261,7 +261,7 @@ impl PerOwnerResolver<'_> {
 
     /// Obtains resolution for a lifetime with the given `NodeId`.
     fn get_lifetime_res(&self, id: NodeId) -> Option<LifetimeRes> {
-        self.general.lifetimes_res_map.get(&id).copied()
+        self.item.lifetimes_res_map.get(&id).copied()
     }
 
     /// Obtain the list of lifetimes parameters to add to an item.

compiler/rustc_middle/src/ty/mod.rs

@@ -195,6 +195,8 @@ pub struct PerOwnerResolverData {
     pub label_res_map: NodeMap<ast::NodeId>,
     /// List functions and methods for which lifetime elision was successful.
     pub lifetime_elision_allowed: FxHashSet<ast::NodeId>,
+    /// Resolutions for lifetimes.
+    pub lifetimes_res_map: NodeMap<LifetimeRes>,
 
     pub trait_map: NodeMap<Vec<hir::TraitCandidate>>,
     /// The id of the owner
@@ -210,6 +212,7 @@ impl PerOwnerResolverData {
             id,
             lifetime_elision_allowed: Default::default(),
             trait_map: Default::default(),
+            lifetimes_res_map: Default::default(),
         }
     }
 }
@@ -222,8 +225,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>>>>,
-    /// 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)>>,
 

compiler/rustc_resolve/src/lib.rs

@@ -1073,8 +1073,6 @@ 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>,
-    /// Resolutions for lifetimes.
-    lifetimes_res_map: NodeMap<LifetimeRes>,
     /// Lifetime parameters that lowering will have to introduce.
     extra_lifetime_params_map: NodeMap<Vec<(Ident, NodeId, LifetimeRes)>>,
 
@@ -1494,7 +1492,6 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
             partial_res_map: Default::default(),
             import_res_map: Default::default(),
             import_use_map: Default::default(),
-            lifetimes_res_map: Default::default(),
             extra_lifetime_params_map: Default::default(),
             extern_crate_map: Default::default(),
             module_children: Default::default(),
@@ -1697,7 +1694,6 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
             owners: self.owners,
             partial_res_map: self.partial_res_map,
             import_res_map: self.import_res_map,
-            lifetimes_res_map: self.lifetimes_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),

compiler/rustc_resolve/src/macros.rs

@@ -525,12 +525,14 @@ impl<'ra, 'tcx> ResolverExpand for Resolver<'ra, 'tcx> {
                     label_res_map,
                     lifetime_elision_allowed,
                     trait_map,
+                    lifetimes_res_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());
             }
         } else {
             assert!(self.owners.insert(old.id, old).is_none());