bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Fix tests.

Browse source 
Avoid invoking queries inside `check_paths`, since we are holding a lock
to the reconstructed graph.
This commit is contained in:
Camille GILLOT 2021-03-06 13:55:20 +01:00
parent 39b306a53d
commit cfe786e5e0
11 changed files with 30 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
compiler/rustc_query_system/src/dep_graph/query.rs
View file

@ -1,11 +1,13 @@
use rustc_data_structures::fx::FxHashMap;
use rustc_data_structures::graph::implementation::{Direction, Graph, NodeIndex, INCOMING};
use rustc_index::vec::IndexVec;
use super::{DepKind, DepNode, DepNodeIndex};
pub struct DepGraphQuery<K> {
pub graph: Graph<DepNode<K>, ()>,
pub indices: FxHashMap<DepNode<K>, NodeIndex>,
pub dep_index_to_index: IndexVec<DepNodeIndex, Option<NodeIndex>>,
}
impl<K: DepKind> DepGraphQuery<K> {
@ -15,18 +17,25 @@ impl<K: DepKind> DepGraphQuery<K> {
let graph = Graph::with_capacity(node_count, edge_count);
let indices = FxHashMap::default();
let dep_index_to_index = IndexVec::new();
DepGraphQuery { graph, indices }
DepGraphQuery { graph, indices, dep_index_to_index }
}
pub fn push(&mut self, index: DepNodeIndex, node: DepNode<K>, edges: &[DepNodeIndex]) {
let source = self.graph.add_node(node);
debug_assert_eq!(index.index(), source.0);
if index.index() >= self.dep_index_to_index.len() {
self.dep_index_to_index.resize(index.index() + 1, None);
}
self.dep_index_to_index[index] = Some(source);
self.indices.insert(node, source);
for &target in edges.iter() {
let target = NodeIndex(target.index());
self.graph.add_edge(source, target, ());
let target = self.dep_index_to_index[target];
// Skip missing edges.
if let Some(target) = target {
self.graph.add_edge(source, target, ());
}
}
}

9
compiler/rustc_query_system/src/dep_graph/serialized.rs
View file

@ -144,7 +144,14 @@ fn encode_node<K: DepKind>(
) -> FileEncodeResult {
#[cfg(debug_assertions)]
if let Some(record_graph) = &_record_graph {
record_graph.lock().push(_index, node.node, &node.edges);
if let Some(record_graph) = &mut if cfg!(parallel_compiler) {
Some(record_graph.lock())
} else {
// Do not ICE when a query is called from within `with_query`.
record_graph.try_lock()
} {
record_graph.push(_index, node.node, &node.edges);
}
}
if let Some(record_stats) = &record_stats {