Use QueryCtxt in DepKindStruct.
This commit is contained in:
parent
b27266fdb2
commit
1ac21e4571
2 changed files with 6 additions and 11 deletions
|
@ -135,7 +135,7 @@ pub struct DepKindStruct {
|
||||||
/// then `force_from_dep_node()` should not fail for it. Otherwise, you can just
|
/// then `force_from_dep_node()` should not fail for it. Otherwise, you can just
|
||||||
/// add it to the "We don't have enough information to reconstruct..." group in
|
/// add it to the "We don't have enough information to reconstruct..." group in
|
||||||
/// the match below.
|
/// the match below.
|
||||||
pub(crate) force_from_dep_node: fn(tcx: TyCtxt<'_>, dep_node: &DepNode) -> bool,
|
pub(crate) force_from_dep_node: fn(tcx: QueryCtxt<'_>, dep_node: &DepNode) -> bool,
|
||||||
|
|
||||||
/// Invoke a query to put the on-disk cached value in memory.
|
/// Invoke a query to put the on-disk cached value in memory.
|
||||||
pub(crate) try_load_from_on_disk_cache: fn(QueryCtxt<'_>, &DepNode),
|
pub(crate) try_load_from_on_disk_cache: fn(QueryCtxt<'_>, &DepNode),
|
||||||
|
@ -251,7 +251,7 @@ pub mod dep_kind {
|
||||||
<query_keys::$variant<'_> as DepNodeParams<TyCtxt<'_>>>::recover(tcx, dep_node)
|
<query_keys::$variant<'_> as DepNodeParams<TyCtxt<'_>>>::recover(tcx, dep_node)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn force_from_dep_node(tcx: TyCtxt<'_>, dep_node: &DepNode) -> bool {
|
fn force_from_dep_node(tcx: QueryCtxt<'_>, dep_node: &DepNode) -> bool {
|
||||||
if is_anon {
|
if is_anon {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -260,13 +260,8 @@ pub mod dep_kind {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if let Some(key) = recover(tcx, dep_node) {
|
if let Some(key) = recover(*tcx, dep_node) {
|
||||||
force_query::<queries::$variant<'_>, _>(
|
force_query::<queries::$variant<'_>, _>(tcx, key, DUMMY_SP, *dep_node);
|
||||||
QueryCtxt { tcx, queries: tcx.queries },
|
|
||||||
key,
|
|
||||||
DUMMY_SP,
|
|
||||||
*dep_node
|
|
||||||
);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -68,7 +68,7 @@ impl QueryContext for QueryCtxt<'tcx> {
|
||||||
self.queries.try_collect_active_jobs()
|
self.queries.try_collect_active_jobs()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn try_load_from_on_disk_cache(&self, dep_node: &dep_graph::DepNode) {
|
fn try_load_from_on_disk_cache(&self, dep_node: &DepNode) {
|
||||||
(dep_node.kind.try_load_from_on_disk_cache)(*self, dep_node)
|
(dep_node.kind.try_load_from_on_disk_cache)(*self, dep_node)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -126,7 +126,7 @@ impl QueryContext for QueryCtxt<'tcx> {
|
||||||
"calling force_from_dep_node() on DepKind::codegen_unit"
|
"calling force_from_dep_node() on DepKind::codegen_unit"
|
||||||
);
|
);
|
||||||
|
|
||||||
(dep_node.kind.force_from_dep_node)(**self, dep_node)
|
(dep_node.kind.force_from_dep_node)(*self, dep_node)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn has_errors_or_delayed_span_bugs(&self) -> bool {
|
fn has_errors_or_delayed_span_bugs(&self) -> bool {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue