bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Reduce calls to current_query_job

Browse source
This commit is contained in:
John Kåre Alsaker 2023-02-16 19:29:11 +01:00
parent f0bc76ac41
commit 5fa60a5d25
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -188,12 +188,12 @@ where
#[cfg(not(parallel_compiler))] #[cfg(not(parallel_compiler))]
let mut state_lock = state.active.lock(); let mut state_lock = state.active.lock();
let lock = &mut *state_lock; let lock = &mut *state_lock;
let current_job_id = qcx.current_query_job();
match lock.entry(key) { match lock.entry(key) {
Entry::Vacant(entry) => { Entry::Vacant(entry) => {
let id = qcx.next_job_id(); let id = qcx.next_job_id();
let job = qcx.current_query_job(); let job = QueryJob::new(id, span, current_job_id);
let job = QueryJob::new(id, span, job);
let key = *entry.key(); let key = *entry.key();
entry.insert(QueryResult::Started(job)); entry.insert(QueryResult::Started(job));
@ -212,7 +212,7 @@ where
// so we just return the error. // so we just return the error.
return TryGetJob::Cycle(id.find_cycle_in_stack( return TryGetJob::Cycle(id.find_cycle_in_stack(
qcx.try_collect_active_jobs().unwrap(), qcx.try_collect_active_jobs().unwrap(),
&qcx.current_query_job(), &current_job_id,
span, span,
)); ));
} }
@ -230,7 +230,7 @@ where
// With parallel queries we might just have to wait on some other // With parallel queries we might just have to wait on some other
// thread. // thread.
let result = latch.wait_on(qcx.current_query_job(), span); let result = latch.wait_on(current_job_id, span);
match result { match result {
Ok(()) => TryGetJob::JobCompleted(query_blocked_prof_timer), Ok(()) => TryGetJob::JobCompleted(query_blocked_prof_timer),