mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove redundant Span in QueryJobInfo

Browse Source 
Previously, `QueryJobInfo` was composed of two parts: a `QueryInfo` and
a `QueryJob`. However, both `QueryInfo` and `QueryJob` have a `span`
field, which seem to be the same. So, the `span` was recorded twice.

Now, `QueryJobInfo` is composed of a `QueryStackFrame` (the other field
of `QueryInfo`) and a `QueryJob`. So, now, the `span` is only recorded
once.
This commit is contained in:
Noah Lev 2021-09-01 11:07:33 -07:00
parent ad3407f482
commit 4553a4baf2
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
compiler/rustc_query_system/src/query/job.rs
View File

@ -61,7 +61,7 @@ where
} }
fn query(self, map: &QueryMap<D>) -> QueryStackFrame { fn query(self, map: &QueryMap<D>) -> QueryStackFrame {
map.get(&self).unwrap().info.query.clone() map.get(&self).unwrap().query.clone()
} }
#[cfg(parallel_compiler)] #[cfg(parallel_compiler)]
@ -81,7 +81,7 @@ where
} }
pub struct QueryJobInfo<D> { pub struct QueryJobInfo<D> {
pub info: QueryInfo, pub query: QueryStackFrame,
pub job: QueryJob<D>, pub job: QueryJob<D>,
} }
@ -155,7 +155,7 @@ where
while let Some(job) = current_job { while let Some(job) = current_job {
let info = query_map.get(&job).unwrap(); let info = query_map.get(&job).unwrap();
cycle.push(info.info.clone()); cycle.push(QueryInfo { span: info.job.span, query: info.query.clone() });
if job == *self { if job == *self {
cycle.reverse(); cycle.reverse();
@ -170,7 +170,7 @@ where
.job .job
.parent .parent
.as_ref() .as_ref()
.map(|parent| (info.info.span, parent.query(&query_map))); .map(|parent| (info.job.span, parent.query(&query_map)));
return CycleError { usage, cycle }; return CycleError { usage, cycle };
} }
@ -649,13 +649,10 @@ pub fn print_query_stack<CTX: QueryContext>(
}; };
let mut diag = Diagnostic::new( let mut diag = Diagnostic::new(
Level::FailureNote, Level::FailureNote,
&format!( &format!("#{} [{}] {}", i, query_info.query.name, query_info.query.description),
"#{} [{}] {}",
i, query_info.info.query.name, query_info.info.query.description
),
); );
diag.span = diag.span =
tcx.dep_context().sess().source_map().guess_head_span(query_info.info.span).into(); tcx.dep_context().sess().source_map().guess_head_span(query_info.job.span).into();
handler.force_print_diagnostic(diag); handler.force_print_diagnostic(diag);
current_query = query_info.job.parent; current_query = query_info.job.parent;

4
compiler/rustc_query_system/src/query/plumbing.rs
View File

@ -130,8 +130,8 @@ where
for (k, v) in shard.active.iter() { for (k, v) in shard.active.iter() {
if let QueryResult::Started(ref job) = *v { if let QueryResult::Started(ref job) = *v {
let id = QueryJobId::new(job.id, shard_id, kind); let id = QueryJobId::new(job.id, shard_id, kind);
let info = QueryInfo { span: job.span, query: make_query(tcx, k.clone()) }; let query = make_query(tcx, k.clone());
jobs.insert(id, QueryJobInfo { info, job: job.clone() }); jobs.insert(id, QueryJobInfo { query, job: job.clone() });
} }
} }
} }