bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Get rid of fn recover

Browse source
This commit is contained in:
Joshua Nelson 2022-08-23 22:49:20 -05:00
parent 70f20ac40e
commit 8f442e8ded
1 changed files with 8 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -299,16 +299,15 @@ pub(crate) fn create_query_frame<
QueryStackFrame::new(name, description, span, def_kind, hash) QueryStackFrame::new(name, description, span, def_kind, hash)
} }
pub(crate) fn try_load_from_on_disk_cache<'tcx, K, V>( pub(crate) fn try_load_from_on_disk_cache<'tcx, K: DepNodeParams<TyCtxt<'tcx>>, V>(
tcx: TyCtxt<'tcx>, tcx: TyCtxt<'tcx>,
dep_node: DepNode, dep_node: DepNode,
recover: fn(TyCtxt<'tcx>, DepNode) -> Option<K>,
cache_on_disk: fn(TyCtxt<'tcx>, &K) -> bool, cache_on_disk: fn(TyCtxt<'tcx>, &K) -> bool,
do_query: fn(TyCtxt<'tcx>, K) -> V, do_query: fn(TyCtxt<'tcx>, K) -> V,
) { ) {
debug_assert!(tcx.dep_graph.is_green(&dep_node)); debug_assert!(tcx.dep_graph.is_green(&dep_node));
let key = recover(tcx, dep_node).unwrap_or_else(|| { let key = K::recover(tcx, &dep_node).unwrap_or_else(|| {
panic!("Failed to recover key for {:?} with hash {}", dep_node, dep_node.hash) panic!("Failed to recover key for {:?} with hash {}", dep_node, dep_node.hash)
}); });
if cache_on_disk(tcx, &key) { if cache_on_disk(tcx, &key) {
@ -316,17 +315,12 @@ pub(crate) fn try_load_from_on_disk_cache<'tcx, K, V>(
} }
} }
pub(crate) fn force_from_dep_node<'tcx, Q>( fn force_from_dep_node<'tcx, Q>(tcx: TyCtxt<'tcx>, dep_node: DepNode) -> bool
tcx: TyCtxt<'tcx>,
// dep_node: rustc_query_system::dep_graph::DepNode<CTX::DepKind>,
dep_node: DepNode,
recover: fn(TyCtxt<'tcx>, DepNode) -> Option<Q::Key>,
) -> bool
where where
Q: QueryDescription<QueryCtxt<'tcx>>, Q: QueryDescription<QueryCtxt<'tcx>>,
Q::Key: DepNodeParams<TyCtxt<'tcx>>, Q::Key: DepNodeParams<TyCtxt<'tcx>>,
{ {
if let Some(key) = recover(tcx, dep_node) { if let Some(key) = Q::Key::recover(tcx, &dep_node) {
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
let _guard = tracing::span!(tracing::Level::TRACE, stringify!($name), ?key).entered(); let _guard = tracing::span!(tracing::Level::TRACE, stringify!($name), ?key).entered();
let tcx = QueryCtxt::from_tcx(tcx); let tcx = QueryCtxt::from_tcx(tcx);
@ -405,7 +399,6 @@ macro_rules! define_queries {
#[allow(nonstandard_style)] #[allow(nonstandard_style)]
mod query_callbacks { mod query_callbacks {
use super::*; use super::*;
use rustc_middle::dep_graph::DepNode;
use rustc_query_system::dep_graph::DepNodeParams; use rustc_query_system::dep_graph::DepNodeParams;
use rustc_query_system::query::QueryDescription; use rustc_query_system::query::QueryDescription;
use rustc_query_system::dep_graph::FingerprintStyle; use rustc_query_system::dep_graph::FingerprintStyle;
@ -479,17 +472,14 @@ macro_rules! define_queries {
} }
} }
#[inline(always)]
fn recover<'tcx>(tcx: TyCtxt<'tcx>, dep_node: DepNode) -> Option<<queries::$name<'tcx> as QueryConfig>::Key> {
<<queries::$name<'_> as QueryConfig>::Key as DepNodeParams<TyCtxt<'_>>>::recover(tcx, &dep_node)
}
DepKindStruct { DepKindStruct {
is_anon, is_anon,
is_eval_always, is_eval_always,
fingerprint_style, fingerprint_style,
force_from_dep_node: Some(|tcx, dep_node| $crate::plumbing::force_from_dep_node::<queries::$name<'_>>(tcx, dep_node, recover)), force_from_dep_node: Some(|tcx, dep_node| $crate::plumbing::force_from_dep_node::<queries::$name<'_>>(tcx, dep_node)),
try_load_from_on_disk_cache: Some(|tcx, key| $crate::plumbing::try_load_from_on_disk_cache(tcx, key, recover, queries::$name::cache_on_disk, TyCtxt::$name)), try_load_from_on_disk_cache: Some(|tcx, key| $crate::plumbing::try_load_from_on_disk_cache::<
<queries::$name<'_> as QueryConfig>::Key, _
>(tcx, key, queries::$name::cache_on_disk, TyCtxt::$name)),
} }
})* })*
} }