Move trait_map into per-owner tables

Author: oli-obk

compiler/rustc_ast_lowering/src/lib.rs

@@ -708,7 +708,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
             self.children.push((def_id, hir::MaybeOwner::NonOwner(hir_id)));
         }
 
-        if let Some(traits) = self.resolver.general.trait_map.remove(&ast_node_id) {
+        if let Some(traits) = self.resolver.item.trait_map.remove(&ast_node_id) {
             self.trait_map.insert(hir_id.local_id, traits.into_boxed_slice());
         }
 

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>,
+
+    pub trait_map: NodeMap<Vec<hir::TraitCandidate>>,
     /// The id of the owner
     pub id: ast::NodeId,
 }
@@ -207,6 +209,7 @@ impl PerOwnerResolverData {
             legacy_const_generic_args: Default::default(),
             id,
             lifetime_elision_allowed: Default::default(),
+            trait_map: Default::default(),
         }
     }
 }
@@ -228,8 +231,6 @@ pub struct ResolverAstLowering {
 
     pub next_node_id: ast::NodeId,
 
-    pub trait_map: NodeMap<Vec<hir::TraitCandidate>>,
-
     /// Lints that were emitted by the resolver and early lints.
     pub lint_buffer: Steal<LintBuffer>,
 

compiler/rustc_resolve/src/lib.rs

@@ -1081,7 +1081,6 @@ pub struct Resolver<'ra, 'tcx> {
     /// `CrateNum` resolutions of `extern crate` items.
     extern_crate_map: UnordMap<LocalDefId, CrateNum>,
     module_children: LocalDefIdMap<Vec<ModChild>>,
-    trait_map: NodeMap<Vec<TraitCandidate>>,
 
     /// A map from nodes to anonymous modules.
     /// Anonymous modules are pseudo-modules that are implicitly created around items
@@ -1499,7 +1498,6 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
             extra_lifetime_params_map: Default::default(),
             extern_crate_map: Default::default(),
             module_children: Default::default(),
-            trait_map: NodeMap::default(),
             underscore_disambiguator: 0,
             empty_module,
             module_map,
@@ -1702,7 +1700,6 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
             lifetimes_res_map: self.lifetimes_res_map,
             extra_lifetime_params_map: self.extra_lifetime_params_map,
             next_node_id: self.next_node_id,
-            trait_map: self.trait_map,
             lint_buffer: Steal::new(self.lint_buffer),
             delegation_fn_sigs: self.delegation_fn_sigs,
         };

compiler/rustc_resolve/src/macros.rs

@@ -524,11 +524,13 @@ impl<'ra, 'tcx> ResolverExpand for Resolver<'ra, 'tcx> {
                     legacy_const_generic_args,
                     label_res_map,
                     lifetime_elision_allowed,
+                    trait_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());
             }
         } else {
             assert!(self.owners.insert(old.id, old).is_none());