rustc: use LocalDefId instead of DefIndex for query keys.

Author: eddyb

src/librustc/dep_graph/dep_node.rs

@@ -51,7 +51,7 @@
 
 use crate::mir;
 use crate::mir::interpret::GlobalId;
-use crate::hir::def_id::{CrateNum, DefId, DefIndex, CRATE_DEF_INDEX};
+use crate::hir::def_id::{CrateNum, DefId, CRATE_DEF_INDEX, LocalDefId};
 use crate::hir::map::DefPathHash;
 use crate::hir::HirId;
 
@@ -447,9 +447,9 @@ impl RecoverKey<'tcx> for DefId {
     }
 }
 
-impl RecoverKey<'tcx> for DefIndex {
+impl RecoverKey<'tcx> for LocalDefId {
     fn recover(tcx: TyCtxt<'tcx>, dep_node: &DepNode) -> Option<Self> {
-        dep_node.extract_def_id(tcx).map(|id| id.index)
+        dep_node.extract_def_id(tcx).map(|id| id.to_local())
     }
 }
 
@@ -501,15 +501,15 @@ impl<'tcx> DepNodeParams<'tcx> for DefId {
     }
 }
 
-impl<'tcx> DepNodeParams<'tcx> for DefIndex {
+impl<'tcx> DepNodeParams<'tcx> for LocalDefId {
     const CAN_RECONSTRUCT_QUERY_KEY: bool = true;
 
     fn to_fingerprint(&self, tcx: TyCtxt<'_>) -> Fingerprint {
-        tcx.hir().definitions().def_path_hash(*self).0
+        self.to_def_id().to_fingerprint(tcx)
     }
 
     fn to_debug_str(&self, tcx: TyCtxt<'tcx>) -> String {
-        tcx.def_path_str(DefId::local(*self))
+        self.to_def_id().to_debug_str(tcx)
     }
 }
 

src/librustc/middle/resolve_lifetime.rs

@@ -342,19 +342,16 @@ pub fn provide(providers: &mut ty::query::Providers<'_>) {
         resolve_lifetimes,
 
         named_region_map: |tcx, id| {
-            let id = LocalDefId::from_def_id(DefId::local(id)); // (*)
             tcx.resolve_lifetimes(LOCAL_CRATE).defs.get(&id)
         },
 
         is_late_bound_map: |tcx, id| {
-            let id = LocalDefId::from_def_id(DefId::local(id)); // (*)
             tcx.resolve_lifetimes(LOCAL_CRATE)
                 .late_bound
                 .get(&id)
         },
 
         object_lifetime_defaults_map: |tcx, id| {
-            let id = LocalDefId::from_def_id(DefId::local(id)); // (*)
             tcx.resolve_lifetimes(LOCAL_CRATE)
                 .object_lifetime_defaults
                 .get(&id)

src/librustc/query/mod.rs

@@ -3,7 +3,7 @@ use crate::ty::query::queries;
 use crate::ty::{self, ParamEnvAnd, Ty, TyCtxt};
 use crate::ty::subst::SubstsRef;
 use crate::dep_graph::{RecoverKey,DepKind, DepNode, SerializedDepNodeIndex};
-use crate::hir::def_id::{CrateNum, DefId, DefIndex};
+use crate::hir::def_id::{CrateNum, DefId, LocalDefId};
 use crate::mir;
 use crate::mir::interpret::GlobalId;
 use crate::traits;
@@ -672,7 +672,7 @@ rustc_queries! {
             no_force
             desc { "computing whether impls specialize one another" }
         }
-        query in_scope_traits_map(_: DefIndex)
+        query in_scope_traits_map(_: LocalDefId)
             -> Option<&'tcx FxHashMap<ItemLocalId, StableVec<TraitCandidate>>> {
             eval_always
             desc { "traits in scope at a block" }
@@ -797,15 +797,15 @@ rustc_queries! {
         query resolve_lifetimes(_: CrateNum) -> &'tcx ResolveLifetimes {
             desc { "resolving lifetimes" }
         }
-        query named_region_map(_: DefIndex) ->
+        query named_region_map(_: LocalDefId) ->
             Option<&'tcx FxHashMap<ItemLocalId, Region>> {
             desc { "looking up a named region" }
         }
-        query is_late_bound_map(_: DefIndex) ->
+        query is_late_bound_map(_: LocalDefId) ->
             Option<&'tcx FxHashSet<ItemLocalId>> {
             desc { "testing if a region is late bound" }
         }
-        query object_lifetime_defaults_map(_: DefIndex)
+        query object_lifetime_defaults_map(_: LocalDefId)
             -> Option<&'tcx FxHashMap<ItemLocalId, Vec<ObjectLifetimeDefault>>> {
             desc { "looking up lifetime defaults for a region" }
         }

src/librustc/ty/context.rs

@@ -10,7 +10,7 @@ use crate::session::config::CrateType;
 use crate::middle;
 use crate::hir::{self, TraitCandidate, HirId, ItemKind, ItemLocalId, Node};
 use crate::hir::def::{Res, DefKind, Export};
-use crate::hir::def_id::{CrateNum, DefId, DefIndex, LOCAL_CRATE};
+use crate::hir::def_id::{CrateNum, DefId, LOCAL_CRATE, LocalDefId};
 use crate::hir::map as hir_map;
 use crate::hir::map::DefPathHash;
 use crate::lint::{self, Lint};
@@ -1054,7 +1054,7 @@ pub struct GlobalCtxt<'tcx> {
 
     /// Map indicating what traits are in scope for places where this
     /// is relevant; generated by resolve.
-    trait_map: FxHashMap<DefIndex,
+    trait_map: FxHashMap<LocalDefId,
                          FxHashMap<ItemLocalId,
                                    StableVec<TraitCandidate>>>,
 
@@ -1248,7 +1248,7 @@ impl<'tcx> TyCtxt<'tcx> {
         let mut trait_map: FxHashMap<_, FxHashMap<_, _>> = FxHashMap::default();
         for (k, v) in resolutions.trait_map {
             let hir_id = hir.node_to_hir_id(k);
-            let map = trait_map.entry(hir_id.owner).or_default();
+            let map = trait_map.entry(hir_id.owner_local_def_id()).or_default();
             map.insert(hir_id.local_id, StableVec::new(v));
         }
 
@@ -2868,23 +2868,23 @@ impl<'tcx> TyCtxt<'tcx> {
     }
 
     pub fn in_scope_traits(self, id: HirId) -> Option<&'tcx StableVec<TraitCandidate>> {
-        self.in_scope_traits_map(id.owner)
+        self.in_scope_traits_map(id.owner_local_def_id())
             .and_then(|map| map.get(&id.local_id))
     }
 
     pub fn named_region(self, id: HirId) -> Option<resolve_lifetime::Region> {
-        self.named_region_map(id.owner)
+        self.named_region_map(id.owner_local_def_id())
             .and_then(|map| map.get(&id.local_id).cloned())
     }
 
     pub fn is_late_bound(self, id: HirId) -> bool {
-        self.is_late_bound_map(id.owner)
+        self.is_late_bound_map(id.owner_local_def_id())
             .map(|set| set.contains(&id.local_id))
             .unwrap_or(false)
     }
 
     pub fn object_lifetime_defaults(self, id: HirId) -> Option<&'tcx [ObjectLifetimeDefault]> {
-        self.object_lifetime_defaults_map(id.owner)
+        self.object_lifetime_defaults_map(id.owner_local_def_id())
             .and_then(|map| map.get(&id.local_id).map(|v| &**v))
     }
 }

src/librustc/ty/query/keys.rs

@@ -1,7 +1,7 @@
 //! Defines the set of legal keys that can be used in queries.
 
 use crate::infer::canonical::Canonical;
-use crate::hir::def_id::{CrateNum, DefId, LOCAL_CRATE, DefIndex};
+use crate::hir::def_id::{CrateNum, DefId, LOCAL_CRATE, LocalDefId};
 use crate::traits;
 use crate::ty::{self, Ty, TyCtxt};
 use crate::ty::subst::SubstsRef;
@@ -62,12 +62,12 @@ impl Key for CrateNum {
     }
 }
 
-impl Key for DefIndex {
+impl Key for LocalDefId {
     fn query_crate(&self) -> CrateNum {
-        LOCAL_CRATE
+        self.to_def_id().query_crate()
     }
-    fn default_span(&self, _tcx: TyCtxt<'_>) -> Span {
-        DUMMY_SP
+    fn default_span(&self, tcx: TyCtxt<'_>) -> Span {
+        self.to_def_id().default_span(tcx)
     }
 }
 

src/librustc/ty/query/mod.rs

@@ -1,5 +1,5 @@
 use crate::dep_graph::{self, DepNode};
-use crate::hir::def_id::{CrateNum, DefId, DefIndex};
+use crate::hir::def_id::{CrateNum, DefId, LocalDefId};
 use crate::hir::def::{DefKind, Export};
 use crate::hir::{self, TraitCandidate, ItemLocalId, CodegenFnAttrs};
 use crate::infer::canonical::{self, Canonical};

src/librustc/ty/query/plumbing.rs

@@ -1117,7 +1117,7 @@ macro_rules! define_provider_struct {
 ///
 /// When you implement a new query, it will likely have a corresponding new
 /// `DepKind`, and you'll have to support it here in `force_from_dep_node()`. As
-/// a rule of thumb, if your query takes a `DefId` or `DefIndex` as sole parameter,
+/// a rule of thumb, if your query takes a `DefId` or `LocalDefId` as sole parameter,
 /// then `force_from_dep_node()` should not fail for it. Otherwise, you can just
 /// add it to the "We don't have enough information to reconstruct..." group in
 /// the match below.

src/librustc_mir/borrow_check/nll/universal_regions.rs

@@ -784,7 +784,7 @@ fn for_each_late_bound_region_defined_on<'tcx>(
     fn_def_id: DefId,
     mut f: impl FnMut(ty::Region<'tcx>),
 ) {
-    if let Some(late_bounds) = tcx.is_late_bound_map(fn_def_id.index) {
+    if let Some(late_bounds) = tcx.is_late_bound_map(fn_def_id.to_local()) {
         for late_bound in late_bounds.iter() {
             let hir_id = HirId {
                 owner: fn_def_id.index,