Move label res map into per-owner tables

Author: oli-obk

compiler/rustc_ast_lowering/src/lib.rs

@@ -256,7 +256,7 @@ impl PerOwnerResolver<'_> {
 
     /// Obtains resolution for a label with the given `NodeId`.
     fn get_label_res(&self, id: NodeId) -> Option<NodeId> {
-        self.general.label_res_map.get(&id).copied()
+        self.item.label_res_map.get(&id).copied()
     }
 
     /// Obtains resolution for a lifetime with the given `NodeId`.

compiler/rustc_middle/src/ty/mod.rs

@@ -191,6 +191,8 @@ pub struct ResolverGlobalCtxt {
 pub struct PerOwnerResolverData {
     pub legacy_const_generic_args: FxHashMap<DefId, Option<Vec<usize>>>,
     pub node_id_to_def_id: NodeMap<LocalDefId>,
+    /// Resolutions for labels (node IDs of their corresponding blocks or loops).
+    pub label_res_map: NodeMap<ast::NodeId>,
     /// The id of the owner
     pub id: ast::NodeId,
 }
@@ -199,6 +201,7 @@ impl PerOwnerResolverData {
     pub fn new(id: ast::NodeId) -> Self {
         Self {
             node_id_to_def_id: Default::default(),
+            label_res_map: Default::default(),
             legacy_const_generic_args: Default::default(),
             id,
         }
@@ -213,8 +216,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 labels (node IDs of their corresponding blocks or loops).
-    pub label_res_map: NodeMap<ast::NodeId>,
     /// Resolutions for lifetimes.
     pub lifetimes_res_map: NodeMap<LifetimeRes>,
     /// Lifetime parameters that lowering will have to introduce.

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 labels (node IDs of their corresponding blocks or loops).
-    label_res_map: NodeMap<NodeId>,
     /// Resolutions for lifetimes.
     lifetimes_res_map: NodeMap<LifetimeRes>,
     /// Lifetime parameters that lowering will have to introduce.
@@ -1499,7 +1497,6 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
             partial_res_map: Default::default(),
             import_res_map: Default::default(),
             import_use_map: Default::default(),
-            label_res_map: Default::default(),
             lifetimes_res_map: Default::default(),
             extra_lifetime_params_map: Default::default(),
             extern_crate_map: Default::default(),
@@ -1705,7 +1702,6 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
             owners: self.owners,
             partial_res_map: self.partial_res_map,
             import_res_map: self.import_res_map,
-            label_res_map: self.label_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,

compiler/rustc_resolve/src/macros.rs

@@ -518,10 +518,15 @@ impl<'ra, 'tcx> ResolverExpand for Resolver<'ra, 'tcx> {
         let old_id = old.id;
         if old.id == DUMMY_NODE_ID {
             if cfg!(debug_assertions) {
-                let PerOwnerResolverData { node_id_to_def_id, id: _, legacy_const_generic_args } =
-                    old;
+                let PerOwnerResolverData {
+                    node_id_to_def_id,
+                    id: _,
+                    legacy_const_generic_args,
+                    label_res_map,
+                } = old;
                 assert!(node_id_to_def_id.is_empty());
                 assert!(legacy_const_generic_args.is_empty());
+                assert!(label_res_map.is_empty());
             }
         } else {
             assert!(self.owners.insert(old.id, old).is_none());