]> git.lizzy.rs Git - rust.git/commitdiff
Enable debugging the dep-graph without debug-assertions.
authorCamille GILLOT <gillot.camille@gmail.com>
Wed, 31 Mar 2021 15:12:03 +0000 (17:12 +0200)
committerCamille GILLOT <gillot.camille@gmail.com>
Wed, 31 Mar 2021 15:12:06 +0000 (17:12 +0200)
It may also be useful in these cases,
and some CI configurations test without debug assertions.

compiler/rustc_query_system/src/dep_graph/serialized.rs

index 1e34b14d9060f237321ad13b061d7f9c64364eaa..6f3d1fb71994e11b78a72a63c7af61c8d44128ec 100644 (file)
@@ -157,11 +157,11 @@ fn new(encoder: FileEncoder, record_stats: bool) -> Self {
         }
     }
 
-    #[instrument(skip(self, _record_graph))]
+    #[instrument(skip(self, record_graph))]
     fn encode_node(
         &mut self,
         node: &NodeInfo<K>,
-        _record_graph: &Option<Lock<DepGraphQuery<K>>>,
+        record_graph: &Option<Lock<DepGraphQuery<K>>>,
     ) -> DepNodeIndex {
         let index = DepNodeIndex::new(self.total_node_count);
         self.total_node_count += 1;
@@ -169,8 +169,7 @@ fn encode_node(
         let edge_count = node.edges.len();
         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`.
             if let Some(record_graph) = &mut record_graph.try_lock() {
                 record_graph.push(index, node.node, &node.edges);
@@ -222,11 +221,8 @@ pub fn new(
         record_graph: bool,
         record_stats: bool,
     ) -> Self {
-        let record_graph = if cfg!(debug_assertions) && record_graph {
-            Some(Lock::new(DepGraphQuery::new(prev_node_count)))
-        } else {
-            None
-        };
+        let record_graph =
+            if record_graph { Some(Lock::new(DepGraphQuery::new(prev_node_count))) } else { None };
         let status = Lock::new(EncoderState::new(encoder, record_stats));
         GraphEncoder { status, record_graph }
     }