Reuse -Zincremental_verify_ich.

Author: cjgillot

compiler/rustc_query_system/src/dep_graph/graph.rs

@@ -1081,7 +1081,7 @@ pub(super) struct CurrentDepGraph<D: Deps> {
     forbidden_edge: Option<EdgeFilter>,
 
     /// Used to verify the absence of hash collisions among DepNodes.
-    /// This field is only `Some` if the `-Z incremental_verify_depnodes` option is present.
+    /// This field is only `Some` if the `-Z incremental_verify_ich` option is present.
     #[cfg(debug_assertions)]
     seen_dep_nodes: Option<Lock<FxHashSet<DepNode>>>,
 
@@ -1154,7 +1154,7 @@ impl<D: Deps> CurrentDepGraph<D> {
             #[cfg(debug_assertions)]
             fingerprints: Lock::new(IndexVec::from_elem_n(None, new_node_count_estimate)),
             #[cfg(debug_assertions)]
-            seen_dep_nodes: session.opts.unstable_opts.incremental_verify_depnodes.then(|| {
+            seen_dep_nodes: session.opts.unstable_opts.incremental_verify_ich.then(|| {
                 Lock::new(FxHashSet::with_capacity_and_hasher(
                     new_node_count_estimate,
                     Default::default(),

compiler/rustc_session/src/options.rs

@@ -1820,12 +1820,11 @@ options! {
     incremental_info: bool = (false, parse_bool, [UNTRACKED],
         "print high-level information about incremental reuse (or the lack thereof) \
         (default: no)"),
-    incremental_verify_depnodes: bool = (false, parse_bool, [UNTRACKED],
-        "verify incr. comp. dep-nodes for hash collisions (default: no)"),
     incremental_verify_ich: bool = (false, parse_bool, [UNTRACKED],
         "verify extended properties for incr. comp. (default: no):
         - hashes of green query instances
-        - hash collisions of query keys"),
+        - hash collisions of query keys
+        - hash collisions when creating dep-nodes"),
     inline_in_all_cgus: Option<bool> = (None, parse_opt_bool, [TRACKED],
         "control whether `#[inline]` functions are in all CGUs"),
     inline_llvm: bool = (true, parse_bool, [TRACKED],