nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-29 19:47:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use nodes_newly_allocated_in_current_session to lookup forbidden reads

Browse Source
This commit is contained in:
John Kåre Alsaker 2025-03-18 13:02:01 +01:00
parent bd8b628262
commit 129f39cb89
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
compiler/rustc_query_system/src/dep_graph/graph.rs
View File

@ -677,7 +677,7 @@ impl<D: Deps> DepGraphData<D> {
&self.current.nodes_newly_allocated_in_current_session &self.current.nodes_newly_allocated_in_current_session
{ {
outline(|| { outline(|| {
let seen = nodes_newly_allocated_in_current_session.lock().contains(dep_node); let seen = nodes_newly_allocated_in_current_session.lock().contains_key(dep_node);
assert!(!seen, "{}", msg()); assert!(!seen, "{}", msg());
}); });
} }
@ -1141,7 +1141,7 @@ pub(super) struct CurrentDepGraph<D: Deps> {
/// ///
/// The map contains all DepNodes that have been allocated in the current session so far and /// The map contains all DepNodes that have been allocated in the current session so far and
/// for which there is no equivalent in the previous session. /// for which there is no equivalent in the previous session.
nodes_newly_allocated_in_current_session: Option<Lock<FxHashSet<DepNode>>>, nodes_newly_allocated_in_current_session: Option<Lock<FxHashMap<DepNode, DepNodeIndex>>>,
/// Anonymous `DepNode`s are nodes whose IDs we compute from the list of /// Anonymous `DepNode`s are nodes whose IDs we compute from the list of
/// their edges. This has the beneficial side-effect that multiple anonymous /// their edges. This has the beneficial side-effect that multiple anonymous
@ -1216,7 +1216,7 @@ impl<D: Deps> CurrentDepGraph<D> {
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
fingerprints: Lock::new(IndexVec::from_elem_n(None, new_node_count_estimate)), fingerprints: Lock::new(IndexVec::from_elem_n(None, new_node_count_estimate)),
nodes_newly_allocated_in_current_session: new_node_dbg.then(|| { nodes_newly_allocated_in_current_session: new_node_dbg.then(|| {
Lock::new(FxHashSet::with_capacity_and_hasher( Lock::new(FxHashMap::with_capacity_and_hasher(
new_node_count_estimate, new_node_count_estimate,
Default::default(), Default::default(),
)) ))
@ -1253,7 +1253,11 @@ impl<D: Deps> CurrentDepGraph<D> {
self.nodes_newly_allocated_in_current_session self.nodes_newly_allocated_in_current_session
{ {
outline(|| { outline(|| {
if !nodes_newly_allocated_in_current_session.lock().insert(key) { if nodes_newly_allocated_in_current_session
.lock()
.insert(key, dep_node_index)
.is_some()
{
panic!("Found duplicate dep-node {key:?}"); panic!("Found duplicate dep-node {key:?}");
} }
}); });
@ -1355,7 +1359,7 @@ impl<D: Deps> CurrentDepGraph<D> {
!self !self
.nodes_newly_allocated_in_current_session .nodes_newly_allocated_in_current_session
.as_ref() .as_ref()
.map_or(false, |set| set.lock().contains(node)), .map_or(false, |set| set.lock().contains_key(node)),
"node from previous graph present in new node collection" "node from previous graph present in new node collection"
); );
} }
@ -1477,6 +1481,15 @@ fn panic_on_forbidden_read<D: Deps>(data: &DepGraphData<D>, dep_node_index: DepN
} }
} }
if dep_node.is_none()
&& let Some(nodes) = &data.current.nodes_newly_allocated_in_current_session
{
// Try to find it among the nodes allocated so far in this session
if let Some((node, _)) = nodes.lock().iter().find(|&(_, index)| *index == dep_node_index) {
dep_node = Some(*node);
}
}
let dep_node = dep_node.map_or_else( let dep_node = dep_node.map_or_else(
|| format!("with index {:?}", dep_node_index), || format!("with index {:?}", dep_node_index),
|dep_node| format!("`{:?}`", dep_node), |dep_node| format!("`{:?}`", dep_node),