Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create a job immediately when looking in the query map and start it later #50067

Closed
wants to merge 1 commit into from
Closed

Create a job immediately when looking in the query map and start it later #50067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions src/librustc/ty/maps/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,24 @@ use traits::query::{CanonicalProjectionGoal, CanonicalTyGoal};
use ty::{self, ParamEnvAnd, Ty, TyCtxt};
use ty::subst::Substs;
use ty::maps::queries;
use ty::maps::Query;
use ty::maps::QueryMap;

use std::hash::Hash;
use syntax_pos::symbol::InternedString;
use rustc_data_structures::sync::Lock;

/// Query configuration and description traits.

pub trait QueryConfig {
pub trait QueryConfig<'tcx> {
type Key: Eq + Hash + Clone;
type Value;
type Value: Clone;

fn query(key: Self::Key) -> Query<'tcx>;
fn query_map<'a>(tcx: TyCtxt<'a, 'tcx, '_>) -> &'a Lock<QueryMap<'tcx, Self>>;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe add a little word of warning here to not use this directly.

}

pub(super) trait QueryDescription<'tcx>: QueryConfig {
pub(super) trait QueryDescription<'tcx>: QueryConfig<'tcx> {
fn describe(tcx: TyCtxt, key: Self::Key) -> String;

#[inline]
Expand All @@ -41,7 +47,7 @@ pub(super) trait QueryDescription<'tcx>: QueryConfig {
}
}

impl<'tcx, M: QueryConfig<Key=DefId>> QueryDescription<'tcx> for M {
impl<'tcx, M: QueryConfig<'tcx, Key=DefId>> QueryDescription<'tcx> for M {
default fn describe(tcx: TyCtxt, def_id: DefId) -> String {
if !tcx.sess.verbose() {
format!("processing `{}`", tcx.item_path_str(def_id))
Expand Down
1 change: 0 additions & 1 deletion src/librustc/ty/maps/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ pub use self::plumbing::force_from_dep_node;

mod job;
pub use self::job::{QueryJob, QueryInfo};
use self::job::QueryResult;

mod keys;
pub use self::keys::Key;
Expand Down
8 changes: 4 additions & 4 deletions src/librustc/ty/maps/on_disk_cache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,8 @@ impl<'sess> OnDiskCache<'sess> {
encode_query_results::<specialization_graph_of, _>(tcx, enc, qri)?;

// const eval is special, it only encodes successfully evaluated constants
use ty::maps::plumbing::GetCacheInternal;
for (key, entry) in const_eval::get_cache_internal(tcx).map.iter() {
use ty::maps::QueryConfig;
for (key, entry) in const_eval::query_map(tcx).borrow().map.iter() {
use ty::maps::config::QueryDescription;
if const_eval::cache_on_disk(key.clone()) {
let entry = match *entry {
Expand Down Expand Up @@ -1124,7 +1124,7 @@ fn encode_query_results<'enc, 'a, 'tcx, Q, E>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
encoder: &mut CacheEncoder<'enc, 'a, 'tcx, E>,
query_result_index: &mut EncodedQueryResultIndex)
-> Result<(), E::Error>
where Q: super::plumbing::GetCacheInternal<'tcx>,
where Q: super::config::QueryDescription<'tcx>,
E: 'enc + TyEncoder,
Q::Value: Encodable,
{
Expand All @@ -1133,7 +1133,7 @@ fn encode_query_results<'enc, 'a, 'tcx, Q, E>(tcx: TyCtxt<'a, 'tcx, 'tcx>,

time(tcx.sess, desc, || {

for (key, entry) in Q::get_cache_internal(tcx).map.iter() {
for (key, entry) in Q::query_map(tcx).borrow().map.iter() {
if Q::cache_on_disk(key.clone()) {
let entry = match *entry {
QueryResult::Complete(ref v) => v,
Expand Down
Loading