languages/rust
languages/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust synced 2024-10-16 13:34:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify try_load_from_on_disk_cache

Browse source
This commit is contained in:
Joshua Nelson 2022-08-23 23:34:23 -05:00
parent 83b6dc9588
commit 4fcc745266
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -301,18 +301,20 @@ pub(crate) fn create_query_frame<
QueryStackFrame::new(name, description, span, def_kind, hash)
}
pub(crate) fn try_load_from_on_disk_cache<'tcx, K: DepNodeParams<TyCtxt<'tcx>>, V>(
pub(crate) fn try_load_from_on_disk_cache<'tcx, Q, V>(
tcx: TyCtxt<'tcx>,
dep_node: DepNode,
cache_on_disk: fn(TyCtxt<'tcx>, &K) -> bool,
cache_query_deps: fn(TyCtxt<'tcx>, K) -> V,
) {
cache_query_deps: fn(TyCtxt<'tcx>, Q::Key) -> V,
) where
Q: QueryDescription<QueryCtxt<'tcx>>,
Q::Key: DepNodeParams<TyCtxt<'tcx>>,
{
debug_assert!(tcx.dep_graph.is_green(&dep_node));
let key = K::recover(tcx, &dep_node).unwrap_or_else(|| {
let key = Q::Key::recover(tcx, &dep_node).unwrap_or_else(|| {
panic!("Failed to recover key for {:?} with hash {}", dep_node, dep_node.hash)
});
if cache_on_disk(tcx, &key) {
if Q::cache_on_disk(tcx, &key) {
let _ = cache_query_deps(tcx, key);
}
}
@ -434,7 +436,6 @@ fn make_vtable(tcx: QueryCtxt<'tcx>, key: &Self::Key) ->
#[allow(nonstandard_style)]
mod query_callbacks {
use super::*;
use rustc_query_system::query::QueryDescription;
use rustc_query_system::dep_graph::FingerprintStyle;
// We use this for most things when incr. comp. is turned off.
@ -495,7 +496,7 @@ pub fn CompileMonoItem() -> DepKindStruct {
type Q<'tcx> = queries::$name<'tcx>;
$crate::plumbing::query_callback::<Q<'_>>(
|tcx, key| $crate::plumbing::try_load_from_on_disk_cache::<<Q<'_> as QueryConfig>::Key, _>(tcx, key, <Q<'_>>::cache_on_disk, TyCtxt::$name),
|tcx, key| $crate::plumbing::try_load_from_on_disk_cache::<Q<'_>, _>(tcx, key, TyCtxt::$name),
|tcx, key| $crate::plumbing::force_from_dep_node::<Q<'_>>(tcx, key),
is_anon,
is_eval_always