Deduplicate DepNode::ConstEval()

Author: michaelwoerister

src/librustc/dep_graph/dep_node.rs

@@ -64,8 +64,9 @@ use hir::def_id::{CrateNum, DefId};
 use hir::map::DefPathHash;
 
 use ich::Fingerprint;
-use ty::fast_reject::SimplifiedType;
 use ty::{TyCtxt, Instance, InstanceDef};
+use ty::fast_reject::SimplifiedType;
+use ty::subst::Substs;
 use rustc_data_structures::stable_hasher::{StableHasher, HashStable};
 use ich::StableHashingContext;
 use std::fmt;
@@ -420,7 +421,7 @@ define_dep_nodes!( <'tcx>
     TypeckBodiesKrate,
     TypeckTables(DefId),
     HasTypeckTables(DefId),
-    ConstEval(DefId),
+    ConstEval { def_id: DefId, substs: &'tcx Substs<'tcx> },
     SymbolName(DefId),
     InstanceSymbolName { instance: Instance<'tcx> },
     SpecializationGraph(DefId),

src/librustc/ty/maps.rs

@@ -1011,8 +1011,8 @@ fn typeck_item_bodies_dep_node<'tcx>(_: CrateNum) -> DepConstructor<'tcx> {
     DepConstructor::TypeckBodiesKrate
 }
 
-fn const_eval_dep_node<'tcx>((def_id, _): (DefId, &Substs)) -> DepConstructor<'tcx> {
-    DepConstructor::ConstEval(def_id)
+fn const_eval_dep_node<'tcx>((def_id, substs): (DefId, &'tcx Substs<'tcx>)) -> DepConstructor<'tcx> {
+    DepConstructor::ConstEval { def_id, substs }
 }
 
 fn mir_keys<'tcx>(_: CrateNum) -> DepConstructor<'tcx> {