bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Rewrite representability

Browse source
This commit is contained in:
Cameron Steffen 2022-08-15 14:11:11 -05:00
parent e42c4d7218
commit ff940db666
61 changed files with 537 additions and 744 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/rustc_query_impl/src/keys.rs
View file

@ -27,6 +27,10 @@ pub trait Key {
fn key_as_def_id(&self) -> Option<DefId> {
None
}
fn ty_adt_id(&self) -> Option<DefId> {
None
}
}
impl Key for () {
@ -407,6 +411,12 @@ impl<'tcx> Key for Ty<'tcx> {
fn default_span(&self, _: TyCtxt<'_>) -> Span {
DUMMY_SP
}
fn ty_adt_id(&self) -> Option<DefId> {
match self.kind() {
ty::Adt(adt, _) => Some(adt.did()),
_ => None,
}
}
}
impl<'tcx> Key for TyAndLayout<'tcx> {

8
compiler/rustc_query_impl/src/plumbing.rs
View file

@ -318,13 +318,12 @@ pub(crate) fn create_query_frame<
} else {
Some(key.default_span(*tcx))
};
let def_id = key.key_as_def_id();
let def_kind = if kind == dep_graph::DepKind::opt_def_kind {
// Try to avoid infinite recursion.
None
} else {
key.key_as_def_id()
.and_then(|def_id| def_id.as_local())
.and_then(|def_id| tcx.opt_def_kind(def_id))
def_id.and_then(|def_id| def_id.as_local()).and_then(|def_id| tcx.opt_def_kind(def_id))
};
let hash = || {
tcx.with_stable_hashing_context(|mut hcx| {
@ -334,8 +333,9 @@ pub(crate) fn create_query_frame<
hasher.finish::<u64>()
})
};
let ty_adt_id = key.ty_adt_id();
QueryStackFrame::new(name, description, span, def_kind, hash)
QueryStackFrame::new(name, description, span, def_id, def_kind, ty_adt_id, hash)
}
fn try_load_from_on_disk_cache<'tcx, Q>(tcx: TyCtxt<'tcx>, dep_node: DepNode)