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

Use FxIndexMap instead FxHashMap to stabilize iteration order in EffectiveVisibilities.

Browse Source 
Part of https://github.com/rust-lang/compiler-team/issues/533
This commit is contained in:
Michael Woerister 2024-03-01 14:12:11 +01:00
parent 6cbf0926d5
commit a50490c579
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compiler/rustc_middle/src/middle/privacy.rs
View File

@ -2,7 +2,7 @@
//! outside their scopes. This pass will also generate a set of exported items //! outside their scopes. This pass will also generate a set of exported items
//! which are available for use externally when compiled as a library. //! which are available for use externally when compiled as a library.
use crate::ty::{TyCtxt, Visibility}; use crate::ty::{TyCtxt, Visibility};
use rustc_data_structures::fx::FxHashMap; use rustc_data_structures::fx::{FxIndexMap, IndexEntry};
use rustc_data_structures::stable_hasher::{HashStable, StableHasher}; use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
use rustc_hir::def::DefKind; use rustc_hir::def::DefKind;
use rustc_macros::HashStable; use rustc_macros::HashStable;
@ -90,7 +90,7 @@ pub fn min(mut self, lhs: EffectiveVisibility, tcx: TyCtxt<'_>) -> Self {
/// Holds a map of effective visibilities for reachable HIR nodes. /// Holds a map of effective visibilities for reachable HIR nodes.
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub struct EffectiveVisibilities<Id = LocalDefId> { pub struct EffectiveVisibilities<Id = LocalDefId> {
map: FxHashMap<Id, EffectiveVisibility>, map: FxIndexMap<Id, EffectiveVisibility>,
} }
impl EffectiveVisibilities { impl EffectiveVisibilities {
@ -130,9 +130,8 @@ pub fn update_eff_vis(
eff_vis: &EffectiveVisibility, eff_vis: &EffectiveVisibility,
tcx: TyCtxt<'_>, tcx: TyCtxt<'_>,
) { ) {
use std::collections::hash_map::Entry;
match self.map.entry(def_id) { match self.map.entry(def_id) {
Entry::Occupied(mut occupied) => { IndexEntry::Occupied(mut occupied) => {
let old_eff_vis = occupied.get_mut(); let old_eff_vis = occupied.get_mut();
for l in Level::all_levels() { for l in Level::all_levels() {
let vis_at_level = eff_vis.at_level(l); let vis_at_level = eff_vis.at_level(l);
@ -145,7 +144,7 @@ pub fn update_eff_vis(
} }
old_eff_vis old_eff_vis
} }
Entry::Vacant(vacant) => vacant.insert(*eff_vis), IndexEntry::Vacant(vacant) => vacant.insert(*eff_vis),
}; };
} }