Move legacy_const_generic_args into per-owner tables

Author: oli-obk

compiler/rustc_ast_lowering/src/lib.rs

@@ -236,7 +236,7 @@ impl PerOwnerResolver<'_> {
                     return None;
                 }
 
-                if let Some(v) = self.general.legacy_const_generic_args.get(&def_id) {
+                if let Some(v) = self.item.legacy_const_generic_args.get(&def_id) {
                     return v.clone();
                 }
             }

compiler/rustc_middle/src/ty/mod.rs

@@ -189,23 +189,26 @@ pub struct ResolverGlobalCtxt {
 
 #[derive(Debug)]
 pub struct PerOwnerResolverData {
+    pub legacy_const_generic_args: FxHashMap<DefId, Option<Vec<usize>>>,
     pub node_id_to_def_id: NodeMap<LocalDefId>,
     /// The id of the owner
     pub id: ast::NodeId,
 }
 
 impl PerOwnerResolverData {
     pub fn new(id: ast::NodeId) -> Self {
-        Self { node_id_to_def_id: Default::default(), id }
+        Self {
+            node_id_to_def_id: Default::default(),
+            legacy_const_generic_args: Default::default(),
+            id,
+        }
     }
 }
 
 /// Resolutions that should only be used for lowering.
 /// This struct is meant to be consumed by lowering.
 #[derive(Debug)]
 pub struct ResolverAstLowering {
-    pub legacy_const_generic_args: FxHashMap<DefId, Option<Vec<usize>>>,
-
     /// Resolutions for nodes that have a single resolution.
     pub partial_res_map: NodeMap<hir::def::PartialRes>,
     /// Resolutions for import nodes, which have multiple resolutions in different namespaces.

compiler/rustc_resolve/src/lib.rs

@@ -1200,7 +1200,6 @@ pub struct Resolver<'ra, 'tcx> {
     /// and how the `impl Trait` fragments were introduced.
     invocation_parents: FxHashMap<LocalExpnId, InvocationParent>,
 
-    legacy_const_generic_args: FxHashMap<DefId, Option<Vec<usize>>>,
     /// Amount of lifetime parameters for each item in the crate.
     item_generics_num_lifetimes: FxHashMap<LocalDefId, usize>,
     delegation_fn_sigs: LocalDefIdMap<DelegationFnSig>,
@@ -1585,7 +1584,6 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
             def_id_to_node_id,
             placeholder_field_indices: Default::default(),
             invocation_parents,
-            legacy_const_generic_args: Default::default(),
             item_generics_num_lifetimes: Default::default(),
             main_def: Default::default(),
             trait_impls: Default::default(),
@@ -1705,7 +1703,6 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
         };
         let ast_lowering = ty::ResolverAstLowering {
             owners: self.owners,
-            legacy_const_generic_args: self.legacy_const_generic_args,
             partial_res_map: self.partial_res_map,
             import_res_map: self.import_res_map,
             label_res_map: self.label_res_map,

compiler/rustc_resolve/src/macros.rs

@@ -518,8 +518,10 @@ 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: _ } = old;
+                let PerOwnerResolverData { node_id_to_def_id, id: _, legacy_const_generic_args } =
+                    old;
                 assert!(node_id_to_def_id.is_empty());
+                assert!(legacy_const_generic_args.is_empty());
             }
         } else {
             assert!(self.owners.insert(old.id, old).is_none());