bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Only clone key when needed.

Browse source
This commit is contained in:
Camille GILLOT 2020-11-02 22:36:47 +01:00
parent 5e35fadddb
commit 0edc775b90
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/rustc_query_system/src/query/plumbing.rs
View file

@ -495,7 +495,7 @@ where
// promoted to the current session during // promoted to the current session during
// `try_mark_green()`, so we can ignore them here. // `try_mark_green()`, so we can ignore them here.
let loaded = tcx.start_query(job.id, None, || { let loaded = tcx.start_query(job.id, None, || {
try_load_from_disk_and_cache_in_memory(tcx, key.clone(), &dep_node, query, compute) try_load_from_disk_and_cache_in_memory(tcx, &key, &dep_node, query, compute)
}); });
if let Some((result, dep_node_index)) = loaded { if let Some((result, dep_node_index)) = loaded {
return job.complete(result, dep_node_index); return job.complete(result, dep_node_index);
@ -509,12 +509,13 @@ where
fn try_load_from_disk_and_cache_in_memory<CTX, K, V>( fn try_load_from_disk_and_cache_in_memory<CTX, K, V>(
tcx: CTX, tcx: CTX,
key: K, key: &K,
dep_node: &DepNode<CTX::DepKind>, dep_node: &DepNode<CTX::DepKind>,
query: &QueryVtable<CTX, K, V>, query: &QueryVtable<CTX, K, V>,
compute: fn(CTX::DepContext, K) -> V, compute: fn(CTX::DepContext, K) -> V,
) -> Option<(V, DepNodeIndex)> ) -> Option<(V, DepNodeIndex)>
where where
K: Clone,
CTX: QueryContext, CTX: QueryContext,
V: Debug, V: Debug,
{ {
@ -527,7 +528,7 @@ where
debug_assert!(tcx.dep_context().dep_graph().is_green(dep_node)); debug_assert!(tcx.dep_context().dep_graph().is_green(dep_node));
// First we try to load the result from the on-disk cache. // First we try to load the result from the on-disk cache.
let result = if query.cache_on_disk(tcx, &key, None) { let result = if query.cache_on_disk(tcx, key, None) {
let prof_timer = tcx.dep_context().profiler().incr_cache_loading(); let prof_timer = tcx.dep_context().profiler().incr_cache_loading();
let result = query.try_load_from_disk(tcx, prev_dep_node_index); let result = query.try_load_from_disk(tcx, prev_dep_node_index);
prof_timer.finish_with_query_invocation_id(dep_node_index.into()); prof_timer.finish_with_query_invocation_id(dep_node_index.into());
@ -559,7 +560,8 @@ where
let prof_timer = tcx.dep_context().profiler().query_provider(); let prof_timer = tcx.dep_context().profiler().query_provider();
// The dep-graph for this computation is already in-place. // The dep-graph for this computation is already in-place.
let result = tcx.dep_context().dep_graph().with_ignore(|| compute(*tcx.dep_context(), key)); let result =
tcx.dep_context().dep_graph().with_ignore(|| compute(*tcx.dep_context(), key.clone()));
prof_timer.finish_with_query_invocation_id(dep_node_index.into()); prof_timer.finish_with_query_invocation_id(dep_node_index.into());