Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Querify WF-checking so it can be cached #48939

Merged
merged 5 commits into from
Mar 22, 2018
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Queryify check_trait_item_well_formed
Fixes #46753
  • Loading branch information
wesleywiser committed Mar 16, 2018
commit edbd02fd35ffd3724a415c05c21e4e4fc5575e1e
1 change: 1 addition & 0 deletions src/librustc/dep_graph/dep_node.rs
Original file line number Diff line number Diff line change
@@ -580,6 +580,7 @@ define_dep_nodes!( <'tcx>
[] IsNoBuiltins(CrateNum),
[] ImplDefaultness(DefId),
[] CheckItemWellFormed(DefId),
[] CheckTraitItemWellFormed(DefId),
[] ReachableNonGenerics(CrateNum),
[] NativeLibraries(CrateNum),
[] PluginRegistrarFn(CrateNum),
1 change: 1 addition & 0 deletions src/librustc/ty/maps/mod.rs
Original file line number Diff line number Diff line change
@@ -299,6 +299,7 @@ define_maps! { <'tcx>
[] fn impl_defaultness: ImplDefaultness(DefId) -> hir::Defaultness,

[] fn check_item_well_formed: CheckItemWellFormed(DefId) -> (),
[] fn check_trait_item_well_formed: CheckTraitItemWellFormed(DefId) -> (),

// The DefIds of all non-generic functions and statics in the given crate
// that can be reached from outside the crate.
1 change: 1 addition & 0 deletions src/librustc/ty/maps/plumbing.rs
Original file line number Diff line number Diff line change
@@ -872,6 +872,7 @@ pub fn force_from_dep_node<'a, 'gcx, 'lcx>(tcx: TyCtxt<'a, 'gcx, 'lcx>,
DepKind::IsNoBuiltins => { force!(is_no_builtins, krate!()); }
DepKind::ImplDefaultness => { force!(impl_defaultness, def_id!()); }
DepKind::CheckItemWellFormed => { force!(check_item_well_formed, def_id!()); }
DepKind::CheckTraitItemWellFormed => { force!(check_trait_item_well_formed, def_id!()); }
DepKind::ReachableNonGenerics => { force!(reachable_non_generics, krate!()); }
DepKind::NativeLibraries => { force!(native_libraries, krate!()); }
DepKind::PluginRegistrarFn => { force!(plugin_registrar_fn, krate!()); }
5 changes: 5 additions & 0 deletions src/librustc_typeck/check/mod.rs
Original file line number Diff line number Diff line change
@@ -722,6 +722,10 @@ fn check_item_well_formed<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, def_id: DefId)
wfcheck::CheckTypeWellFormed::new(tcx).check_item_well_formed(def_id);
}

fn check_trait_item_well_formed<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, def_id: DefId) {
wfcheck::CheckTypeWellFormed::new(tcx).check_trait_item(def_id);
}

pub fn provide(providers: &mut Providers) {
*providers = Providers {
typeck_item_bodies,
@@ -730,6 +734,7 @@ pub fn provide(providers: &mut Providers) {
adt_destructor,
used_trait_imports,
check_item_well_formed,
check_trait_item_well_formed,
..*providers
};
}
20 changes: 14 additions & 6 deletions src/librustc_typeck/check/wfcheck.rs
Original file line number Diff line number Diff line change
@@ -159,6 +159,18 @@ impl<'a, 'gcx> CheckTypeWellFormed<'a, 'gcx> {
}
}

pub fn check_trait_item(&mut self, def_id: DefId) {
let node_id = self.tcx.hir.as_local_node_id(def_id).unwrap();
let trait_item = self.tcx.hir.expect_trait_item(node_id);

let method_sig = match trait_item.node {
hir::TraitItemKind::Method(ref sig, _) => Some(sig),
_ => None
};
CheckTypeWellFormed::new(self.tcx)
.check_associated_item(trait_item.id, trait_item.span, method_sig);
}

fn check_associated_item(&mut self,
item_id: ast::NodeId,
span: Span,
@@ -675,12 +687,8 @@ impl<'a, 'tcx, 'v> Visitor<'v> for CheckTypeWellFormedVisitor<'a, 'tcx> {

fn visit_trait_item(&mut self, trait_item: &'v hir::TraitItem) {
debug!("visit_trait_item: {:?}", trait_item);
let method_sig = match trait_item.node {
hir::TraitItemKind::Method(ref sig, _) => Some(sig),
_ => None
};
CheckTypeWellFormed::new(self.tcx)
.check_associated_item(trait_item.id, trait_item.span, method_sig);
let def_id = self.tcx.hir.local_def_id(trait_item.id);
ty::maps::queries::check_trait_item_well_formed::ensure(self.tcx, def_id);
intravisit::walk_trait_item(self, trait_item)
}