Ignore span references from diagnostics.

[rust.git] / compiler / rustc_query_system / src / dep_graph / graph.rs

diff --git a/compiler/rustc_query_system/src/dep_graph/graph.rs b/compiler/rustc_query_system/src/dep_graph/graph.rs
index 52957ee0222387b62747d335e3429016184cf0bf..0b1ff5d709fe904e96dd3703ba79966817af37c0 100644 (file)
--- a/compiler/rustc_query_system/src/dep_graph/graph.rs
+++ b/compiler/rustc_query_system/src/dep_graph/graph.rs
@@ -634,7 +634,7 @@ pub fn register_dep_node_debug_str<F>(&self, dep_node: DepNode<K>, debug_str_gen
         if dep_node_debug.borrow().contains_key(&dep_node) {
             return;
         }
-        let debug_str = debug_str_gen();
+        let debug_str = self.with_ignore(debug_str_gen);
         dep_node_debug.borrow_mut().insert(dep_node, debug_str);
     }
 
@@ -829,7 +829,9 @@ fn try_mark_previous_green<Qcx: QueryContext<DepKind = K>>(
         );
 
         if !side_effects.is_empty() {
-            self.emit_side_effects(qcx, data, dep_node_index, side_effects);
+            self.with_query_deserialization(|| {
+                self.emit_side_effects(qcx, data, dep_node_index, side_effects)
+            });
         }
 
         // ... and finally storing a "Green" entry in the color map.