squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Split try_execute_query.

Browse source
This commit is contained in:
Camille GILLOT 2021-05-11 20:24:34 +02:00
parent 307aacaf05
commit ef4becdce4
1 changed files with 31 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -411,7 +411,7 @@ where
C::Key: Clone + DepNodeParams<CTX::DepContext>, C::Key: Clone + DepNodeParams<CTX::DepContext>,
CTX: QueryContext, CTX: QueryContext,
{ {
let job = match JobOwner::<'_, CTX::DepKind, C::Key>::try_start( match JobOwner::<'_, CTX::DepKind, C::Key>::try_start(
&tcx, &tcx,
state, state,
span, span,
@ -419,10 +419,14 @@ where
lookup, lookup,
query.dep_kind, query.dep_kind,
) { ) {
TryGetJob::NotYetStarted(job) => job, TryGetJob::NotYetStarted(job) => {
let (result, dep_node_index) = execute_job(tcx, key, dep_node, query, job.id, compute);
let result = job.complete(cache, result, dep_node_index);
(result, Some(dep_node_index))
}
TryGetJob::Cycle(error) => { TryGetJob::Cycle(error) => {
let result = mk_cycle(tcx, error, query.handle_cycle_error, &cache.cache); let result = mk_cycle(tcx, error, query.handle_cycle_error, &cache.cache);
return (result, None); (result, None)
} }
#[cfg(parallel_compiler)] #[cfg(parallel_compiler)]
TryGetJob::JobCompleted(query_blocked_prof_timer) => { TryGetJob::JobCompleted(query_blocked_prof_timer) => {
@ -440,27 +444,40 @@ where
} }
query_blocked_prof_timer.finish_with_query_invocation_id(index.into()); query_blocked_prof_timer.finish_with_query_invocation_id(index.into());
return (v, Some(index)); (v, Some(index))
} }
}; }
}
fn execute_job<CTX, K, V>(
tcx: CTX,
key: K,
dep_node: Option<DepNode<CTX::DepKind>>,
query: &QueryVtable<CTX, K, V>,
job_id: QueryJobId<CTX::DepKind>,
compute: fn(CTX::DepContext, K) -> V,
) -> (V, DepNodeIndex)
where
K: Clone + DepNodeParams<CTX::DepContext>,
V: Debug,
CTX: QueryContext,
{
let dep_graph = tcx.dep_context().dep_graph(); let dep_graph = tcx.dep_context().dep_graph();
// Fast path for when incr. comp. is off. // Fast path for when incr. comp. is off.
if !dep_graph.is_fully_enabled() { if !dep_graph.is_fully_enabled() {
let prof_timer = tcx.dep_context().profiler().query_provider(); let prof_timer = tcx.dep_context().profiler().query_provider();
let result = tcx.start_query(job.id, None, || compute(*tcx.dep_context(), key)); let result = tcx.start_query(job_id, None, || compute(*tcx.dep_context(), key));
let dep_node_index = dep_graph.next_virtual_depnode_index(); let dep_node_index = dep_graph.next_virtual_depnode_index();
prof_timer.finish_with_query_invocation_id(dep_node_index.into()); prof_timer.finish_with_query_invocation_id(dep_node_index.into());
let result = job.complete(cache, result, dep_node_index); return (result, dep_node_index);
return (result, None);
} }
let (result, dep_node_index) = if query.anon { if query.anon {
let prof_timer = tcx.dep_context().profiler().query_provider(); let prof_timer = tcx.dep_context().profiler().query_provider();
let ((result, dep_node_index), diagnostics) = with_diagnostics(|diagnostics| { let ((result, dep_node_index), diagnostics) = with_diagnostics(|diagnostics| {
tcx.start_query(job.id, diagnostics, || { tcx.start_query(job_id, diagnostics, || {
dep_graph.with_anon_task(*tcx.dep_context(), query.dep_kind, || { dep_graph.with_anon_task(*tcx.dep_context(), query.dep_kind, || {
compute(*tcx.dep_context(), key) compute(*tcx.dep_context(), key)
}) })
@ -479,24 +496,22 @@ where
} else if query.eval_always { } else if query.eval_always {
// `to_dep_node` is expensive for some `DepKind`s. // `to_dep_node` is expensive for some `DepKind`s.
let dep_node = dep_node.unwrap_or_else(|| query.to_dep_node(*tcx.dep_context(), &key)); let dep_node = dep_node.unwrap_or_else(|| query.to_dep_node(*tcx.dep_context(), &key));
force_query_with_job(tcx, key, job.id, dep_node, query, compute) force_query_with_job(tcx, key, job_id, dep_node, query, compute)
} else { } else {
// `to_dep_node` is expensive for some `DepKind`s. // `to_dep_node` is expensive for some `DepKind`s.
let dep_node = dep_node.unwrap_or_else(|| query.to_dep_node(*tcx.dep_context(), &key)); let dep_node = dep_node.unwrap_or_else(|| query.to_dep_node(*tcx.dep_context(), &key));
// The diagnostics for this query will be // The diagnostics for this query will be
// 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, &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 {
(result, dep_node_index) (result, dep_node_index)
} else { } else {
force_query_with_job(tcx, key, job.id, dep_node, query, compute) force_query_with_job(tcx, key, job_id, dep_node, query, compute)
} }
}; }
let result = job.complete(cache, result, dep_node_index);
(result, Some(dep_node_index))
} }
fn try_load_from_disk_and_cache_in_memory<CTX, K, V>( fn try_load_from_disk_and_cache_in_memory<CTX, K, V>(