bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Erase query cache values

Browse source
This commit is contained in:
John Kåre Alsaker 2023-02-07 08:32:30 +01:00
parent f211da7101
commit 785459d630
8 changed files with 329 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,7 +4,7 @@ use crate::dep_graph::{DepNode, DepNodeParams, SerializedDepNodeIndex};
use crate::error::HandleCycleError;
use crate::ich::StableHashingContext;
use crate::query::caches::QueryCache;
use crate::query::{QueryContext, QueryState};
use crate::query::{QueryContext, QueryInfo, QueryState};
use rustc_data_structures::fingerprint::Fingerprint;
use std::fmt::Debug;
@ -45,6 +45,12 @@ pub trait QueryConfig<Qcx: QueryContext>: Copy {
fn loadable_from_disk(self, qcx: Qcx, key: &Self::Key, idx: SerializedDepNodeIndex) -> bool;
fn from_cycle_error(
self,
tcx: Qcx::DepContext,
cycle: &[QueryInfo<Qcx::DepKind>],
) -> Self::Value;
fn anon(self) -> bool;
fn eval_always(self) -> bool;
fn depth_limit(self) -> bool;

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

@ -11,7 +11,6 @@ use crate::query::job::QueryLatch;
use crate::query::job::{report_cycle, QueryInfo, QueryJob, QueryJobId, QueryJobInfo};
use crate::query::SerializedDepNodeIndex;
use crate::query::{QueryContext, QueryMap, QuerySideEffects, QueryStackFrame};
use crate::values::Value;
use crate::HandleCycleError;
use rustc_data_structures::fingerprint::Fingerprint;
use rustc_data_structures::fx::FxHashMap;
@ -120,43 +119,45 @@ where
#[cold]
#[inline(never)]
fn mk_cycle<Qcx, R, D: DepKind>(
fn mk_cycle<Q, Qcx>(
query: Q,
qcx: Qcx,
cycle_error: CycleError<D>,
cycle_error: CycleError<Qcx::DepKind>,
handler: HandleCycleError,
) -> R
) -> Q::Value
where
Qcx: QueryContext + HasDepContext<DepKind = D>,
R: std::fmt::Debug + Value<Qcx::DepContext, Qcx::DepKind>,
Q: QueryConfig<Qcx>,
Qcx: QueryContext,
{
let error = report_cycle(qcx.dep_context().sess(), &cycle_error);
handle_cycle_error(*qcx.dep_context(), &cycle_error, error, handler)
handle_cycle_error(query, qcx, &cycle_error, error, handler)
}
fn handle_cycle_error<Tcx, V>(
tcx: Tcx,
cycle_error: &CycleError<Tcx::DepKind>,
fn handle_cycle_error<Q, Qcx>(
query: Q,
qcx: Qcx,
cycle_error: &CycleError<Qcx::DepKind>,
mut error: DiagnosticBuilder<'_, ErrorGuaranteed>,
handler: HandleCycleError,
) -> V
) -> Q::Value
where
Tcx: DepContext,
V: Value<Tcx, Tcx::DepKind>,
Q: QueryConfig<Qcx>,
Qcx: QueryContext,
{
use HandleCycleError::*;
match handler {
Error => {
error.emit();
Value::from_cycle_error(tcx, &cycle_error.cycle)
query.from_cycle_error(*qcx.dep_context(), &cycle_error.cycle)
}
Fatal => {
error.emit();
tcx.sess().abort_if_errors();
qcx.dep_context().sess().abort_if_errors();
unreachable!()
}
DelayBug => {
error.delay_as_bug();
Value::from_cycle_error(tcx, &cycle_error.cycle)
query.from_cycle_error(*qcx.dep_context(), &cycle_error.cycle)
}
}
}
@ -269,7 +270,7 @@ where
&qcx.current_query_job(),
span,
);
(mk_cycle(qcx, error, query.handle_cycle_error()), None)
(mk_cycle(query, qcx, error, query.handle_cycle_error()), None)
}
#[inline(always)]
@ -306,7 +307,7 @@ where
(v, Some(index))
}
Err(cycle) => (mk_cycle(qcx, cycle, query.handle_cycle_error()), None),
Err(cycle) => (mk_cycle(query, qcx, cycle, query.handle_cycle_error()), None),
}
}