bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Move key recovering into force_query.

Browse source
This commit is contained in:
Camille GILLOT 2020-11-02 20:05:10 +01:00
parent e1ff91f439
commit c2c59ae304
3 changed files with 39 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_query_impl/src/lib.rs
View file

@ -26,7 +26,7 @@ use rustc_middle::ty::query::{query_keys, query_storage, query_stored, query_val
use rustc_middle::ty::query::{Providers, QueryEngine};
use rustc_middle::ty::{self, TyCtxt};
use rustc_serialize::opaque;
use rustc_span::{Span, DUMMY_SP};
use rustc_span::Span;
#[macro_use]
mod plumbing;

15
compiler/rustc_query_impl/src/plumbing.rs
View file

@ -457,20 +457,7 @@ macro_rules! define_queries {
}
fn force_from_dep_node(tcx: QueryCtxt<'_>, dep_node: &DepNode) -> bool {
if is_anon {
return false;
}
if !can_reconstruct_query_key() {
return false;
}
if let Some(key) = recover(*tcx, dep_node) {
force_query::<queries::$name<'_>, _>(tcx, key, DUMMY_SP, *dep_node);
return true;
}
false
force_query::<queries::$name<'_>, _>(tcx, dep_node)
}
fn try_load_from_on_disk_cache(tcx: QueryCtxt<'_>, dep_node: &DepNode) {