nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 23:04:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable debugging the dep-graph without debug-assertions.

Browse Source 
It may also be useful in these cases,
and some CI configurations test without debug assertions.
This commit is contained in:
Camille GILLOT 2021-03-31 17:12:03 +02:00
parent 8ee9322c10
commit f3dde45d2a
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
compiler/rustc_query_system/src/dep_graph/serialized.rs
View File

@ -157,11 +157,11 @@ impl<K: DepKind> EncoderState<K> {
} }
} }
#[instrument(skip(self, _record_graph))] #[instrument(skip(self, record_graph))]
fn encode_node( fn encode_node(
&mut self, &mut self,
node: &NodeInfo<K>, node: &NodeInfo<K>,
_record_graph: &Option<Lock<DepGraphQuery<K>>>, record_graph: &Option<Lock<DepGraphQuery<K>>>,
) -> DepNodeIndex { ) -> DepNodeIndex {
let index = DepNodeIndex::new(self.total_node_count); let index = DepNodeIndex::new(self.total_node_count);
self.total_node_count += 1; self.total_node_count += 1;
@ -169,8 +169,7 @@ impl<K: DepKind> EncoderState<K> {
let edge_count = node.edges.len(); let edge_count = node.edges.len();
self.total_edge_count += edge_count; self.total_edge_count += edge_count;
#[cfg(debug_assertions)] if let Some(record_graph) = &record_graph {
if let Some(record_graph) = &_record_graph {
// Do not ICE when a query is called from within `with_query`. // Do not ICE when a query is called from within `with_query`.
if let Some(record_graph) = &mut record_graph.try_lock() { if let Some(record_graph) = &mut record_graph.try_lock() {
record_graph.push(index, node.node, &node.edges); record_graph.push(index, node.node, &node.edges);
@ -222,11 +221,8 @@ impl<K: DepKind + Encodable<FileEncoder>> GraphEncoder<K> {
record_graph: bool, record_graph: bool,
record_stats: bool, record_stats: bool,
) -> Self { ) -> Self {
let record_graph = if cfg!(debug_assertions) && record_graph { let record_graph =
Some(Lock::new(DepGraphQuery::new(prev_node_count))) if record_graph { Some(Lock::new(DepGraphQuery::new(prev_node_count))) } else { None };
} else {
None
};
let status = Lock::new(EncoderState::new(encoder, record_stats)); let status = Lock::new(EncoderState::new(encoder, record_stats));
GraphEncoder { status, record_graph } GraphEncoder { status, record_graph }
} }