bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #98881 - cjgillot:q-def-kind, r=fee1-dead

Browse source 
Only compute DefKind through the query.
This commit is contained in:
Dylan DPC 2022-07-06 14:49:08 +05:30 • committed by GitHub
commit 707c0d9a2d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -282,11 +282,14 @@ macro_rules! define_queries {
} else {
Some(key.default_span(*tcx))
};
// Use `tcx.hir().opt_def_kind()` to reduce the chance of
// accidentally triggering an infinite query loop.
let def_kind = key.key_as_def_id()
.and_then(|def_id| def_id.as_local())
.and_then(|def_id| tcx.hir().opt_def_kind(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))
};
let hash = || {
let mut hcx = tcx.create_stable_hashing_context();
let mut hasher = StableHasher::new();