nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-04 19:29:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move ensure_sufficient_stack to try_execute_query callers

Browse Source
This commit is contained in:
John Kåre Alsaker 2023-02-16 19:34:31 +01:00
parent 5fa60a5d25
commit a049550c45
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/rustc_query_impl/src/plumbing.rs
View File

@ -124,9 +124,7 @@ impl QueryContext for QueryCtxt<'_> {
}; };
// Use the `ImplicitCtxt` while we execute the query. // Use the `ImplicitCtxt` while we execute the query.
tls::enter_context(&new_icx, || { tls::enter_context(&new_icx, compute)
rustc_data_structures::stack::ensure_sufficient_stack(compute)
})
}) })
} }

23
compiler/rustc_query_system/src/query/plumbing.rs
View File

@ -15,6 +15,7 @@ use rustc_data_structures::fx::FxHashMap;
use rustc_data_structures::profiling::TimingGuard; use rustc_data_structures::profiling::TimingGuard;
#[cfg(parallel_compiler)] #[cfg(parallel_compiler)]
use rustc_data_structures::sharded::Sharded; use rustc_data_structures::sharded::Sharded;
use rustc_data_structures::stack::ensure_sufficient_stack;
use rustc_data_structures::sync::Lock; use rustc_data_structures::sync::Lock;
use rustc_errors::{DiagnosticBuilder, ErrorGuaranteed, FatalError}; use rustc_errors::{DiagnosticBuilder, ErrorGuaranteed, FatalError};
use rustc_session::Session; use rustc_session::Session;
@ -348,8 +349,6 @@ where
fn try_execute_query<Q, Qcx>( fn try_execute_query<Q, Qcx>(
qcx: Qcx, qcx: Qcx,
state: &QueryState<Q::Key, Qcx::DepKind>,
cache: &Q::Cache,
span: Span, span: Span,
key: Q::Key, key: Q::Key,
dep_node: Option<DepNode<Qcx::DepKind>>, dep_node: Option<DepNode<Qcx::DepKind>>,
@ -358,9 +357,11 @@ where
Q: QueryConfig<Qcx>, Q: QueryConfig<Qcx>,
Qcx: QueryContext, Qcx: QueryContext,
{ {
let state = Q::query_state(qcx);
match JobOwner::<'_, Q::Key, Qcx::DepKind>::try_start(&qcx, state, span, key) { match JobOwner::<'_, Q::Key, Qcx::DepKind>::try_start(&qcx, state, span, key) {
TryGetJob::NotYetStarted(job) => { TryGetJob::NotYetStarted(job) => {
let (result, dep_node_index) = execute_job::<Q, Qcx>(qcx, key, dep_node, job.id); let (result, dep_node_index) = execute_job::<Q, Qcx>(qcx, key, dep_node, job.id);
let cache = Q::query_cache(qcx);
if Q::FEEDABLE { if Q::FEEDABLE {
// We should not compute queries that also got a value via feeding. // We should not compute queries that also got a value via feeding.
// This can't happen, as query feeding adds the very dependencies to the fed query // This can't happen, as query feeding adds the very dependencies to the fed query
@ -381,7 +382,7 @@ where
} }
#[cfg(parallel_compiler)] #[cfg(parallel_compiler)]
TryGetJob::JobCompleted(query_blocked_prof_timer) => { TryGetJob::JobCompleted(query_blocked_prof_timer) => {
let Some((v, index)) = cache.lookup(&key) else { let Some((v, index)) = Q::query_cache(qcx).lookup(&key) else {
panic!("value must be in cache after waiting") panic!("value must be in cache after waiting")
}; };
@ -739,14 +740,8 @@ where
None None
}; };
let (result, dep_node_index) = try_execute_query::<Q, Qcx>( let (result, dep_node_index) =
qcx, ensure_sufficient_stack(|| try_execute_query::<Q, Qcx>(qcx, span, key, dep_node));
Q::query_state(qcx),
Q::query_cache(qcx),
span,
key,
dep_node,
);
if let Some(dep_node_index) = dep_node_index { if let Some(dep_node_index) = dep_node_index {
qcx.dep_context().dep_graph().read_index(dep_node_index) qcx.dep_context().dep_graph().read_index(dep_node_index)
} }
@ -762,14 +757,12 @@ where
{ {
// We may be concurrently trying both execute and force a query. // We may be concurrently trying both execute and force a query.
// Ensure that only one of them runs the query. // Ensure that only one of them runs the query.
let cache = Q::query_cache(qcx); if let Some((_, index)) = Q::query_cache(qcx).lookup(&key) {
if let Some((_, index)) = cache.lookup(&key) {
qcx.dep_context().profiler().query_cache_hit(index.into()); qcx.dep_context().profiler().query_cache_hit(index.into());
return; return;
} }
let state = Q::query_state(qcx);
debug_assert!(!Q::ANON); debug_assert!(!Q::ANON);
try_execute_query::<Q, _>(qcx, state, cache, DUMMY_SP, key, Some(dep_node)); ensure_sufficient_stack(|| try_execute_query::<Q, _>(qcx, DUMMY_SP, key, Some(dep_node)));
} }