bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Sort mir_keys to ensure consistent diagnostic order.

Browse source
This commit is contained in:
Camille GILLOT 2020-12-27 23:46:41 +01:00
parent d88420a52a
commit 5a60f0a86f
1 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
compiler/rustc_metadata/src/rmeta/encoder.rs
View file

@ -1185,11 +1185,24 @@ impl EncodeContext<'a, 'tcx> {
if self.is_proc_macro { if self.is_proc_macro {
return; return;
} }
for &def_id in self.tcx.mir_keys(LOCAL_CRATE).iter() {
let mut keys_and_jobs = self
.tcx
.mir_keys(LOCAL_CRATE)
.iter()
.filter_map(|&def_id| {
let (encode_const, encode_opt) = should_encode_mir(self.tcx, def_id); let (encode_const, encode_opt) = should_encode_mir(self.tcx, def_id);
if !encode_const && !encode_opt { if encode_const || encode_opt {
continue; Some((def_id, encode_const, encode_opt))
} else {
None
} }
})
.collect::<Vec<_>>();
// Sort everything to ensure a stable order for diagnotics.
keys_and_jobs.sort_by_key(|&(def_id, _, _)| def_id);
for (def_id, encode_const, encode_opt) in keys_and_jobs.into_iter() {
debug_assert!(encode_const || encode_opt);
debug!("EntryBuilder::encode_mir({:?})", def_id); debug!("EntryBuilder::encode_mir({:?})", def_id);
if encode_opt { if encode_opt {