From e62f4838424208f0f980f6bf95d17610694c80d4 Mon Sep 17 00:00:00 2001
From: Camille GILLOT <gillot.camille@gmail.com>
Date: Thu, 10 Mar 2022 19:07:27 +0100
Subject: [PATCH] Create trait_def table.
---
compiler/rustc_metadata/src/rmeta/decoder.rs | 37 ++-----------------
.../src/rmeta/decoder/cstore_impl.rs | 2 +-
compiler/rustc_metadata/src/rmeta/encoder.rs | 19 ++++------
compiler/rustc_metadata/src/rmeta/mod.rs | 14 +------
compiler/rustc_middle/src/ty/trait_def.rs | 13 +------
compiler/rustc_typeck/src/collect.rs | 3 --
6 files changed, 16 insertions(+), 72 deletions(-)
diff --git a/compiler/rustc_metadata/src/rmeta/decoder.rs b/compiler/rustc_metadata/src/rmeta/decoder.rs
index b98d5817a9c..388d36e2766 100644
--- a/compiler/rustc_metadata/src/rmeta/decoder.rs
+++ b/compiler/rustc_metadata/src/rmeta/decoder.rs
@@ -909,37 +909,6 @@ impl<'a, 'tcx> CrateMetadataRef<'a> {
)
}
- fn get_trait_def(self, item_id: DefIndex, sess: &Session) -> ty::TraitDef {
- match self.kind(item_id) {
- EntryKind::Trait(data) => {
- let data = data.decode((self, sess));
- ty::TraitDef::new(
- self.local_def_id(item_id),
- data.unsafety,
- data.paren_sugar,
- data.has_auto_impl,
- data.is_marker,
- data.skip_array_during_method_dispatch,
- data.specialization_kind,
- self.def_path_hash(item_id),
- data.must_implement_one_of,
- )
- }
- EntryKind::TraitAlias => ty::TraitDef::new(
- self.local_def_id(item_id),
- hir::Unsafety::Normal,
- false,
- false,
- false,
- false,
- ty::trait_def::TraitSpecializationKind::None,
- self.def_path_hash(item_id),
- None,
- ),
- _ => bug!("def-index does not refer to trait or trait alias"),
- }
- }
-
fn get_variant(self, kind: &EntryKind, index: DefIndex, parent_did: DefId) -> ty::VariantDef {
let data = match kind {
EntryKind::Variant(data) | EntryKind::Struct(data) | EntryKind::Union(data) => {
@@ -1172,7 +1141,7 @@ impl<'a, 'tcx> CrateMetadataRef<'a> {
callback(exp);
}
}
- EntryKind::Enum | EntryKind::Trait(..) => {}
+ EntryKind::Enum | EntryKind::Trait => {}
_ => bug!("`for_each_module_child` is called on a non-module: {:?}", self.def_kind(id)),
}
}
@@ -1187,7 +1156,7 @@ impl<'a, 'tcx> CrateMetadataRef<'a> {
fn module_expansion(self, id: DefIndex, sess: &Session) -> ExpnId {
match self.kind(id) {
- EntryKind::Mod(_) | EntryKind::Enum | EntryKind::Trait(_) => {
+ EntryKind::Mod(_) | EntryKind::Enum | EntryKind::Trait => {
self.get_expn_that_defined(id, sess)
}
_ => panic!("Expected module, found {:?}", self.local_def_id(id)),
@@ -1396,7 +1365,7 @@ impl<'a, 'tcx> CrateMetadataRef<'a> {
_ => return None,
}
def_key.parent.and_then(|parent_index| match self.kind(parent_index) {
- EntryKind::Trait(_) | EntryKind::TraitAlias => Some(self.local_def_id(parent_index)),
+ EntryKind::Trait | EntryKind::TraitAlias => Some(self.local_def_id(parent_index)),
_ => None,
})
}
diff --git a/compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs b/compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs
index 5a2c59b4601..87ea041b432 100644
--- a/compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs
+++ b/compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs
@@ -153,8 +153,8 @@ provide! { <'tcx> tcx, def_id, other, cdata,
asyncness => { table }
fn_arg_names => { table }
generator_kind => { table }
+ trait_def => { table }
- trait_def => { cdata.get_trait_def(def_id.index, tcx.sess) }
adt_def => { cdata.get_adt_def(def_id.index, tcx) }
adt_destructor => {
let _ = cdata;
diff --git a/compiler/rustc_metadata/src/rmeta/encoder.rs b/compiler/rustc_metadata/src/rmeta/encoder.rs
index b4e020ac845..648a7972cbb 100644
--- a/compiler/rustc_metadata/src/rmeta/encoder.rs
+++ b/compiler/rustc_metadata/src/rmeta/encoder.rs
@@ -1474,19 +1474,16 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
}
hir::ItemKind::Trait(..) => {
let trait_def = self.tcx.trait_def(def_id);
- let data = TraitData {
- unsafety: trait_def.unsafety,
- paren_sugar: trait_def.paren_sugar,
- has_auto_impl: self.tcx.trait_is_auto(def_id),
- is_marker: trait_def.is_marker,
- skip_array_during_method_dispatch: trait_def.skip_array_during_method_dispatch,
- specialization_kind: trait_def.specialization_kind,
- must_implement_one_of: trait_def.must_implement_one_of.clone(),
- };
+ record!(self.tables.trait_def[def_id] <- trait_def);
- EntryKind::Trait(self.lazy(data))
+ EntryKind::Trait
+ }
+ hir::ItemKind::TraitAlias(..) => {
+ let trait_def = self.tcx.trait_def(def_id);
+ record!(self.tables.trait_def[def_id] <- trait_def);
+
+ EntryKind::TraitAlias
}
- hir::ItemKind::TraitAlias(..) => EntryKind::TraitAlias,
hir::ItemKind::ExternCrate(_) | hir::ItemKind::Use(..) => {
bug!("cannot encode info for item {:?}", item)
}
diff --git a/compiler/rustc_metadata/src/rmeta/mod.rs b/compiler/rustc_metadata/src/rmeta/mod.rs
index c2d85efb15d..15e8693d712 100644
--- a/compiler/rustc_metadata/src/rmeta/mod.rs
+++ b/compiler/rustc_metadata/src/rmeta/mod.rs
@@ -320,6 +320,7 @@ define_tables! {
asyncness: Table<DefIndex, Lazy!(hir::IsAsync)>,
fn_arg_names: Table<DefIndex, Lazy!([Ident])>,
generator_kind: Table<DefIndex, Lazy!(hir::GeneratorKind)>,
+ trait_def: Table<DefIndex, Lazy!(ty::TraitDef)>,
trait_item_def_id: Table<DefIndex, Lazy<DefId>>,
inherent_impls: Table<DefIndex, Lazy<[DefIndex]>>,
@@ -360,7 +361,7 @@ enum EntryKind {
ProcMacro(MacroKind),
Closure,
Generator,
- Trait(Lazy<TraitData>),
+ Trait,
Impl,
AssocFn(Lazy<AssocFnData>),
AssocType(AssocContainer),
@@ -377,17 +378,6 @@ struct VariantData {
is_non_exhaustive: bool,
}
-#[derive(TyEncodable, TyDecodable)]
-struct TraitData {
- unsafety: hir::Unsafety,
- paren_sugar: bool,
- has_auto_impl: bool,
- is_marker: bool,
- skip_array_during_method_dispatch: bool,
- specialization_kind: ty::trait_def::TraitSpecializationKind,
- must_implement_one_of: Option<Box<[Ident]>>,
-}
-
/// Describes whether the container of an associated item
/// is a trait or an impl and whether, in a trait, it has
/// a default, or an in impl, whether it's marked "default".
diff --git a/compiler/rustc_middle/src/ty/trait_def.rs b/compiler/rustc_middle/src/ty/trait_def.rs
index 943f610cc0d..ca6fabf7f40 100644
--- a/compiler/rustc_middle/src/ty/trait_def.rs
+++ b/compiler/rustc_middle/src/ty/trait_def.rs
@@ -5,7 +5,6 @@ use crate::ty::{Ident, Ty, TyCtxt};
use hir::def_id::LOCAL_CRATE;
use rustc_hir as hir;
use rustc_hir::def_id::DefId;
-use rustc_hir::definitions::DefPathHash;
use std::iter;
use rustc_data_structures::fx::FxIndexMap;
@@ -13,10 +12,8 @@ use rustc_errors::ErrorGuaranteed;
use rustc_macros::HashStable;
/// A trait's definition with type information.
-#[derive(HashStable)]
+#[derive(HashStable, Encodable, Decodable)]
pub struct TraitDef {
- // We already have the def_path_hash below, no need to hash it twice
- #[stable_hasher(ignore)]
pub def_id: DefId,
pub unsafety: hir::Unsafety,
@@ -43,10 +40,6 @@ pub struct TraitDef {
/// on this trait.
pub specialization_kind: TraitSpecializationKind,
- /// The ICH of this trait's DefPath, cached here so it doesn't have to be
- /// recomputed all the time.
- pub def_path_hash: DefPathHash,
-
/// List of functions from `#[rustc_must_implement_one_of]` attribute one of which
/// must be implemented.
pub must_implement_one_of: Option<Box<[Ident]>>,
@@ -54,7 +47,7 @@ pub struct TraitDef {
/// Whether this trait is treated specially by the standard library
/// specialization lint.
-#[derive(HashStable, PartialEq, Clone, Copy, TyEncodable, TyDecodable)]
+#[derive(HashStable, PartialEq, Clone, Copy, Encodable, Decodable)]
pub enum TraitSpecializationKind {
/// The default. Specializing on this trait is not allowed.
None,
@@ -92,7 +85,6 @@ impl<'tcx> TraitDef {
is_marker: bool,
skip_array_during_method_dispatch: bool,
specialization_kind: TraitSpecializationKind,
- def_path_hash: DefPathHash,
must_implement_one_of: Option<Box<[Ident]>>,
) -> TraitDef {
TraitDef {
@@ -103,7 +95,6 @@ impl<'tcx> TraitDef {
is_marker,
skip_array_during_method_dispatch,
specialization_kind,
- def_path_hash,
must_implement_one_of,
}
}
diff --git a/compiler/rustc_typeck/src/collect.rs b/compiler/rustc_typeck/src/collect.rs
index 700ae83e4c9..90b880adcd0 100644
--- a/compiler/rustc_typeck/src/collect.rs
+++ b/compiler/rustc_typeck/src/collect.rs
@@ -1218,8 +1218,6 @@ fn trait_def(tcx: TyCtxt<'_>, def_id: DefId) -> ty::TraitDef {
} else {
ty::trait_def::TraitSpecializationKind::None
};
- let def_path_hash = tcx.def_path_hash(def_id);
-
let must_implement_one_of = tcx
.get_attrs(def_id)
.iter()
@@ -1326,7 +1324,6 @@ fn trait_def(tcx: TyCtxt<'_>, def_id: DefId) -> ty::TraitDef {
is_marker,
skip_array_during_method_dispatch,
spec_kind,
- def_path_hash,
must_implement_one_of,
)
}