Skip to content

Commit b5f85cf

Browse files
committed
remove the SimplifiedType from the DepNode for now, just to keep
size of `DepNode` smaller and because we are not that fine-grained yet anyhow
1 parent 84157db commit b5f85cf

File tree

3 files changed

+4
-13
lines changed

3 files changed

+4
-13
lines changed

src/librustc/dep_graph/mod.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
use self::thread::{DepGraphThreadData, DepMessage};
1212
use middle::def_id::DefId;
1313
use middle::ty;
14-
use middle::ty::fast_reject::SimplifiedType;
1514
use rustc_front::hir;
1615
use rustc_front::intravisit::Visitor;
1716
use std::rc::Rc;
@@ -102,7 +101,7 @@ pub enum DepNode {
102101
// which would yield an overly conservative dep-graph.
103102
TraitItems(DefId),
104103
ReprHints(DefId),
105-
TraitSelect(DefId, Option<SimplifiedType>),
104+
TraitSelect(DefId),
106105
}
107106

108107
#[derive(Clone)]

src/librustc/middle/traits/mod.rs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ use middle::def_id::DefId;
2020
use middle::free_region::FreeRegionMap;
2121
use middle::subst;
2222
use middle::ty::{self, Ty, TypeFoldable};
23-
use middle::ty::fast_reject;
2423
use middle::infer::{self, fixup_err_to_string, InferCtxt};
2524

2625
use std::rc::Rc;
@@ -618,15 +617,8 @@ impl<'tcx> FulfillmentError<'tcx> {
618617

619618
impl<'tcx> TraitObligation<'tcx> {
620619
/// Creates the dep-node for selecting/evaluating this trait reference.
621-
fn dep_node(&self, tcx: &ty::ctxt<'tcx>) -> DepNode {
622-
let simplified_ty =
623-
fast_reject::simplify_type(tcx,
624-
self.predicate.skip_binder().self_ty(), // (*)
625-
true);
626-
627-
// (*) skip_binder is ok because `simplify_type` doesn't care about regions
628-
629-
DepNode::TraitSelect(self.predicate.def_id(), simplified_ty)
620+
fn dep_node(&self) -> DepNode {
621+
DepNode::TraitSelect(self.predicate.def_id())
630622
}
631623

632624
fn self_ty(&self) -> ty::Binder<Ty<'tcx>> {

src/librustc/middle/traits/select.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
307307
debug!("select({:?})", obligation);
308308
assert!(!obligation.predicate.has_escaping_regions());
309309

310-
let dep_node = obligation.dep_node(self.tcx());
310+
let dep_node = obligation.dep_node();
311311
let _task = self.tcx().dep_graph.in_task(dep_node);
312312

313313
let stack = self.push_stack(TraitObligationStackList::empty(), obligation);

0 commit comments

Comments
 (0)