From f01ee857a301e203ab960b50c85ac0c370eb1adc Mon Sep 17 00:00:00 2001 From: toidiu Date: Tue, 26 Sep 2017 00:36:38 -0400 Subject: [PATCH 1/8] return an empty inferred_outlives_of --- src/librustc_typeck/collect.rs | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/librustc_typeck/collect.rs b/src/librustc_typeck/collect.rs index 25a37a2c48c..9a66f07cba4 100644 --- a/src/librustc_typeck/collect.rs +++ b/src/librustc_typeck/collect.rs @@ -1329,10 +1329,21 @@ fn early_bound_lifetimes_from_generics<'a, 'tcx>( }) } +//todo +fn inferred_outlives_of<'a, 'tcx>(_tcx: TyCtxt<'a, 'tcx, 'tcx>, + _def_id: DefId) + -> Vec> { + Vec::new() +} + fn predicates_of<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, def_id: DefId) -> ty::GenericPredicates<'tcx> { - explicit_predicates_of(tcx, def_id) + let explicit = explicit_predicates_of(tcx, def_id); + ty::GenericPredicates { + parent: explicit.parent, + predicates: [&explicit.predicates[..], &inferred_outlives_of(tcx, def_id)[..]].concat() + } } fn explicit_predicates_of<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, From 32b968ce443a840b51e605e8a29408aa903aa6bf Mon Sep 17 00:00:00 2001 From: toidiu Date: Tue, 26 Sep 2017 00:48:32 -0400 Subject: [PATCH 2/8] add inferred_outlives_of query --- src/librustc/ty/maps/mod.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/librustc/ty/maps/mod.rs b/src/librustc/ty/maps/mod.rs index 58405c261ad..e14a77ea93b 100644 --- a/src/librustc/ty/maps/mod.rs +++ b/src/librustc/ty/maps/mod.rs @@ -121,6 +121,9 @@ define_maps! { <'tcx> /// (inferred) variance. [] fn variances_of: ItemVariances(DefId) -> Rc>, + /// Maps from def-id of a type to its (inferred) outlives. + [] fn inferred_outlives_of: PredicatesOfItem(DefId) -> ty::GenericPredicates<'tcx>, + /// Maps from an impl/trait def-id to a list of the def-ids of its items [] fn associated_item_def_ids: AssociatedItemDefIds(DefId) -> Rc>, From 7c8a7221a4e3d926c419e1d681db450835733aef Mon Sep 17 00:00:00 2001 From: toidiu Date: Wed, 27 Sep 2017 20:18:41 -0400 Subject: [PATCH 3/8] create a seperate module for outlives. added a query for inferred_outlives. setup some files for upcoming tests --- src/librustc/ty/maps/mod.rs | 2 +- src/librustc_typeck/collect.rs | 9 +----- src/librustc_typeck/lib.rs | 8 ++++++ src/librustc_typeck/outlives/mod.rs | 22 +++++++++++++++ src/librustc_typeck/outlives/test.rs | 41 ++++++++++++++++++++++++++++ 5 files changed, 73 insertions(+), 9 deletions(-) create mode 100644 src/librustc_typeck/outlives/mod.rs create mode 100644 src/librustc_typeck/outlives/test.rs diff --git a/src/librustc/ty/maps/mod.rs b/src/librustc/ty/maps/mod.rs index e14a77ea93b..d13de98df28 100644 --- a/src/librustc/ty/maps/mod.rs +++ b/src/librustc/ty/maps/mod.rs @@ -122,7 +122,7 @@ define_maps! { <'tcx> [] fn variances_of: ItemVariances(DefId) -> Rc>, /// Maps from def-id of a type to its (inferred) outlives. - [] fn inferred_outlives_of: PredicatesOfItem(DefId) -> ty::GenericPredicates<'tcx>, + [] fn inferred_outlives_of: PredicatesOfItem(DefId) -> Vec>, /// Maps from an impl/trait def-id to a list of the def-ids of its items [] fn associated_item_def_ids: AssociatedItemDefIds(DefId) -> Rc>, diff --git a/src/librustc_typeck/collect.rs b/src/librustc_typeck/collect.rs index 9a66f07cba4..a5b3f8cb806 100644 --- a/src/librustc_typeck/collect.rs +++ b/src/librustc_typeck/collect.rs @@ -1329,20 +1329,13 @@ fn early_bound_lifetimes_from_generics<'a, 'tcx>( }) } -//todo -fn inferred_outlives_of<'a, 'tcx>(_tcx: TyCtxt<'a, 'tcx, 'tcx>, - _def_id: DefId) - -> Vec> { - Vec::new() -} - fn predicates_of<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, def_id: DefId) -> ty::GenericPredicates<'tcx> { let explicit = explicit_predicates_of(tcx, def_id); ty::GenericPredicates { parent: explicit.parent, - predicates: [&explicit.predicates[..], &inferred_outlives_of(tcx, def_id)[..]].concat() + predicates: [&explicit.predicates[..], &tcx.inferred_outlives_of(def_id)[..]].concat() } } diff --git a/src/librustc_typeck/lib.rs b/src/librustc_typeck/lib.rs index 1c047ef98d8..9cf954cecc9 100644 --- a/src/librustc_typeck/lib.rs +++ b/src/librustc_typeck/lib.rs @@ -50,6 +50,8 @@ independently: - variance: variance inference +- outlives: outlives inference + - check: walks over function bodies and type checks them, inferring types for local variables, type parameters, etc as necessary. @@ -122,6 +124,7 @@ mod collect; mod constrained_type_params; mod impl_wf_check; mod coherence; +mod outlives; mod variance; mod namespace; @@ -316,6 +319,11 @@ pub fn check_crate<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>) variance::test::test_variance(tcx)); })?; +// tcx.sess.track_errors(|| { +// time(time_passes, "outlives testing", || +// outlives::test::test_inferred_outlives(tcx)); +// })?; + time(time_passes, "wf checking", || check::check_wf_new(tcx))?; time(time_passes, "item-types checking", || check::check_item_types(tcx))?; diff --git a/src/librustc_typeck/outlives/mod.rs b/src/librustc_typeck/outlives/mod.rs new file mode 100644 index 00000000000..d496ed0e46d --- /dev/null +++ b/src/librustc_typeck/outlives/mod.rs @@ -0,0 +1,22 @@ +// Copyright 2013 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +use rustc::hir::def_id::DefId; +use rustc::ty::{self, TyCtxt}; + +/// Code to write unit test for outlives. +pub mod test; + +//todo +pub fn inferred_outlives_of<'a, 'tcx>(_tcx: TyCtxt<'a, 'tcx, 'tcx>, + _def_id: DefId) + -> Vec> { + Vec::new() +} diff --git a/src/librustc_typeck/outlives/test.rs b/src/librustc_typeck/outlives/test.rs new file mode 100644 index 00000000000..0d45fc58637 --- /dev/null +++ b/src/librustc_typeck/outlives/test.rs @@ -0,0 +1,41 @@ +// Copyright 2013 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +//use rustc::hir; +//use rustc::hir::itemlikevisit::ItemLikeVisitor; +use rustc::ty::TyCtxt; + +//pub fn test_outlives<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>) { +// tcx.hir.krate().visit_all_item_likes(&mut OutlivesTest { tcx }); +//} + +struct OutlivesTest<'a, 'tcx: 'a> { + tcx: TyCtxt<'a, 'tcx, 'tcx> +} + +//impl<'a, 'tcx> ItemLikeVisitor<'tcx> for OutlivesTest<'a, 'tcx> { +// fn visit_item(&mut self, item: &'tcx hir::Item) { +// let item_def_id = self.tcx.hir.local_def_id(item.id); +// +// // For unit testing: check for a special "rustc_outlives" +// // attribute and report an error with various results if found. +// if self.tcx.has_attr(item_def_id, "rustc_outlives") { +// let outlives_of = self.tcx.outlives_of(item_def_id); +// span_err!(self.tcx.sess, +// item.span, +// E0208, +// "{:?}", +// outlives_of); +// } +// } +// +// fn visit_trait_item(&mut self, _: &'tcx hir::TraitItem) { } +// fn visit_impl_item(&mut self, _: &'tcx hir::ImplItem) { } +//} From ba1efa3b61759384fc39ad262cffb0a007b87f95 Mon Sep 17 00:00:00 2001 From: toidiu Date: Wed, 27 Sep 2017 21:01:48 -0400 Subject: [PATCH 4/8] added components for testing. added outlives test to the check_crate function of librustc_typeck --- src/librustc_typeck/diagnostics.rs | 1 + src/librustc_typeck/lib.rs | 9 +++--- src/librustc_typeck/outlives/mod.rs | 11 +++++-- src/librustc_typeck/outlives/test.rs | 48 ++++++++++++++-------------- 4 files changed, 39 insertions(+), 30 deletions(-) diff --git a/src/librustc_typeck/diagnostics.rs b/src/librustc_typeck/diagnostics.rs index 8df97355574..5f741029731 100644 --- a/src/librustc_typeck/diagnostics.rs +++ b/src/librustc_typeck/diagnostics.rs @@ -4679,4 +4679,5 @@ register_diagnostics! { E0627, // yield statement outside of generator literal E0632, // cannot provide explicit type parameters when `impl Trait` is used in // argument position. + E0628, // infer outlives } diff --git a/src/librustc_typeck/lib.rs b/src/librustc_typeck/lib.rs index 9cf954cecc9..ea4ce64e487 100644 --- a/src/librustc_typeck/lib.rs +++ b/src/librustc_typeck/lib.rs @@ -289,6 +289,7 @@ pub fn provide(providers: &mut Providers) { coherence::provide(providers); check::provide(providers); variance::provide(providers); + outlives::provide(providers); } pub fn check_crate<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>) @@ -319,10 +320,10 @@ pub fn check_crate<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>) variance::test::test_variance(tcx)); })?; -// tcx.sess.track_errors(|| { -// time(time_passes, "outlives testing", || -// outlives::test::test_inferred_outlives(tcx)); -// })?; + tcx.sess.track_errors(|| { + time(time_passes, "outlives testing", || + outlives::test::test_inferred_outlives(tcx)); + })?; time(time_passes, "wf checking", || check::check_wf_new(tcx))?; diff --git a/src/librustc_typeck/outlives/mod.rs b/src/librustc_typeck/outlives/mod.rs index d496ed0e46d..1127028cbc8 100644 --- a/src/librustc_typeck/outlives/mod.rs +++ b/src/librustc_typeck/outlives/mod.rs @@ -10,13 +10,20 @@ use rustc::hir::def_id::DefId; use rustc::ty::{self, TyCtxt}; +use rustc::ty::maps::Providers; /// Code to write unit test for outlives. pub mod test; +pub fn provide(providers: &mut Providers) { + *providers = Providers { + inferred_outlives_of, + ..*providers + }; +} + //todo -pub fn inferred_outlives_of<'a, 'tcx>(_tcx: TyCtxt<'a, 'tcx, 'tcx>, - _def_id: DefId) +fn inferred_outlives_of<'a, 'tcx>(_tcx: TyCtxt<'a, 'tcx, 'tcx>, _def_id: DefId) -> Vec> { Vec::new() } diff --git a/src/librustc_typeck/outlives/test.rs b/src/librustc_typeck/outlives/test.rs index 0d45fc58637..665b3d57d91 100644 --- a/src/librustc_typeck/outlives/test.rs +++ b/src/librustc_typeck/outlives/test.rs @@ -8,34 +8,34 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -//use rustc::hir; -//use rustc::hir::itemlikevisit::ItemLikeVisitor; +use rustc::hir; +use rustc::hir::itemlikevisit::ItemLikeVisitor; use rustc::ty::TyCtxt; -//pub fn test_outlives<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>) { -// tcx.hir.krate().visit_all_item_likes(&mut OutlivesTest { tcx }); -//} +pub fn test_inferred_outlives<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>) { + tcx.hir.krate().visit_all_item_likes(&mut OutlivesTest { tcx }); +} struct OutlivesTest<'a, 'tcx: 'a> { tcx: TyCtxt<'a, 'tcx, 'tcx> } -//impl<'a, 'tcx> ItemLikeVisitor<'tcx> for OutlivesTest<'a, 'tcx> { -// fn visit_item(&mut self, item: &'tcx hir::Item) { -// let item_def_id = self.tcx.hir.local_def_id(item.id); -// -// // For unit testing: check for a special "rustc_outlives" -// // attribute and report an error with various results if found. -// if self.tcx.has_attr(item_def_id, "rustc_outlives") { -// let outlives_of = self.tcx.outlives_of(item_def_id); -// span_err!(self.tcx.sess, -// item.span, -// E0208, -// "{:?}", -// outlives_of); -// } -// } -// -// fn visit_trait_item(&mut self, _: &'tcx hir::TraitItem) { } -// fn visit_impl_item(&mut self, _: &'tcx hir::ImplItem) { } -//} +impl<'a, 'tcx> ItemLikeVisitor<'tcx> for OutlivesTest<'a, 'tcx> { + fn visit_item(&mut self, item: &'tcx hir::Item) { + let item_def_id = self.tcx.hir.local_def_id(item.id); + + // For unit testing: check for a special "rustc_outlives" + // attribute and report an error with various results if found. + if self.tcx.has_attr(item_def_id, "rustc_outlives") { + let inferred_outlives_of = self.tcx.inferred_outlives_of(item_def_id); + span_err!(self.tcx.sess, + item.span, + E0628, + "{:?}", + inferred_outlives_of); + } + } + + fn visit_trait_item(&mut self, _: &'tcx hir::TraitItem) { } + fn visit_impl_item(&mut self, _: &'tcx hir::ImplItem) { } +} From c021e5303f7db901a962b7c650ad5b2206801d9c Mon Sep 17 00:00:00 2001 From: toidiu Date: Wed, 27 Sep 2017 21:20:44 -0400 Subject: [PATCH 5/8] add a test case dont duplicate error codes choose unlikely error code specify error pattern in test --- src/librustc_typeck/diagnostics.rs | 2 +- src/librustc_typeck/lib.rs | 10 ++++---- src/librustc_typeck/outlives/test.rs | 2 +- .../compile-fail/outlives-associated-types.rs | 24 +++++++++++++++++++ 4 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 src/test/compile-fail/outlives-associated-types.rs diff --git a/src/librustc_typeck/diagnostics.rs b/src/librustc_typeck/diagnostics.rs index 5f741029731..8f91d07b53f 100644 --- a/src/librustc_typeck/diagnostics.rs +++ b/src/librustc_typeck/diagnostics.rs @@ -4676,8 +4676,8 @@ register_diagnostics! { E0588, // packed struct cannot transitively contain a `[repr(align)]` struct E0592, // duplicate definitions with name `{}` // E0613, // Removed (merged with E0609) + E0640, // infer outlives E0627, // yield statement outside of generator literal E0632, // cannot provide explicit type parameters when `impl Trait` is used in // argument position. - E0628, // infer outlives } diff --git a/src/librustc_typeck/lib.rs b/src/librustc_typeck/lib.rs index ea4ce64e487..49ba0499f78 100644 --- a/src/librustc_typeck/lib.rs +++ b/src/librustc_typeck/lib.rs @@ -305,6 +305,11 @@ pub fn check_crate<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>) })?; + tcx.sess.track_errors(|| { + time(time_passes, "outlives testing", || + outlives::test::test_inferred_outlives(tcx)); + })?; + tcx.sess.track_errors(|| { time(time_passes, "impl wf inference", || impl_wf_check::impl_wf_check(tcx)); @@ -320,11 +325,6 @@ pub fn check_crate<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>) variance::test::test_variance(tcx)); })?; - tcx.sess.track_errors(|| { - time(time_passes, "outlives testing", || - outlives::test::test_inferred_outlives(tcx)); - })?; - time(time_passes, "wf checking", || check::check_wf_new(tcx))?; time(time_passes, "item-types checking", || check::check_item_types(tcx))?; diff --git a/src/librustc_typeck/outlives/test.rs b/src/librustc_typeck/outlives/test.rs index 665b3d57d91..196e6605494 100644 --- a/src/librustc_typeck/outlives/test.rs +++ b/src/librustc_typeck/outlives/test.rs @@ -30,7 +30,7 @@ impl<'a, 'tcx> ItemLikeVisitor<'tcx> for OutlivesTest<'a, 'tcx> { let inferred_outlives_of = self.tcx.inferred_outlives_of(item_def_id); span_err!(self.tcx.sess, item.span, - E0628, + E0640, "{:?}", inferred_outlives_of); } diff --git a/src/test/compile-fail/outlives-associated-types.rs b/src/test/compile-fail/outlives-associated-types.rs new file mode 100644 index 00000000000..f742ca81bcc --- /dev/null +++ b/src/test/compile-fail/outlives-associated-types.rs @@ -0,0 +1,24 @@ +// Copyright 2015 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// Test that the outlives computation runs for now... + +#![feature(rustc_attrs)] + +//todo add all the test cases +// https://github.com/rust-lang/rfcs/blob/master/text/2093-infer-outlives.md#example-1-a-reference + +#[rustc_outlives] +struct Direct<'a, T> { + // inferred: `T: 'a` + field: &'a T //~ ERROR generic reference may outlive the data it points to +} + +fn main() { } From fe5cb1a5174f6054d03b6d95f84ff8808e2c89de Mon Sep 17 00:00:00 2001 From: toidiu Date: Sun, 8 Oct 2017 14:45:19 -0400 Subject: [PATCH 6/8] add error to the correct line in unit test --- src/test/compile-fail/outlives-associated-types.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/test/compile-fail/outlives-associated-types.rs b/src/test/compile-fail/outlives-associated-types.rs index f742ca81bcc..778394c9fc8 100644 --- a/src/test/compile-fail/outlives-associated-types.rs +++ b/src/test/compile-fail/outlives-associated-types.rs @@ -16,9 +16,8 @@ // https://github.com/rust-lang/rfcs/blob/master/text/2093-infer-outlives.md#example-1-a-reference #[rustc_outlives] -struct Direct<'a, T> { - // inferred: `T: 'a` - field: &'a T //~ ERROR generic reference may outlive the data it points to +struct Direct<'a, T> { //~ ERROR 19:1: 21:2: [] [E0640] + field: &'a T } fn main() { } From ce754ba4767efcb5ee73246d780da95a379c27f8 Mon Sep 17 00:00:00 2001 From: toidiu Date: Tue, 10 Oct 2017 22:54:59 -0400 Subject: [PATCH 7/8] add a new dep node for outlives --- src/librustc/dep_graph/dep_node.rs | 1 + src/librustc/ty/maps/mod.rs | 2 +- src/librustc/ty/maps/plumbing.rs | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/librustc/dep_graph/dep_node.rs b/src/librustc/dep_graph/dep_node.rs index 4600cdbc692..92bbb745bb2 100644 --- a/src/librustc/dep_graph/dep_node.rs +++ b/src/librustc/dep_graph/dep_node.rs @@ -476,6 +476,7 @@ define_dep_nodes!( <'tcx> [] TypeOfItem(DefId), [] GenericsOfItem(DefId), [] PredicatesOfItem(DefId), + [] InferredOutlivesOf(DefId), [] SuperPredicatesOfItem(DefId), [] TraitDefOfItem(DefId), [] AdtDefOfItem(DefId), diff --git a/src/librustc/ty/maps/mod.rs b/src/librustc/ty/maps/mod.rs index d13de98df28..f54391ebb07 100644 --- a/src/librustc/ty/maps/mod.rs +++ b/src/librustc/ty/maps/mod.rs @@ -122,7 +122,7 @@ define_maps! { <'tcx> [] fn variances_of: ItemVariances(DefId) -> Rc>, /// Maps from def-id of a type to its (inferred) outlives. - [] fn inferred_outlives_of: PredicatesOfItem(DefId) -> Vec>, + [] fn inferred_outlives_of: InferredOutlivesOf(DefId) -> Vec>, /// Maps from an impl/trait def-id to a list of the def-ids of its items [] fn associated_item_def_ids: AssociatedItemDefIds(DefId) -> Rc>, diff --git a/src/librustc/ty/maps/plumbing.rs b/src/librustc/ty/maps/plumbing.rs index d6eaf6d1bc4..69a9a258d81 100644 --- a/src/librustc/ty/maps/plumbing.rs +++ b/src/librustc/ty/maps/plumbing.rs @@ -736,6 +736,7 @@ pub fn force_from_dep_node<'a, 'gcx, 'lcx>(tcx: TyCtxt<'a, 'gcx, 'lcx>, DepKind::TypeOfItem => { force!(type_of, def_id!()); } DepKind::GenericsOfItem => { force!(generics_of, def_id!()); } DepKind::PredicatesOfItem => { force!(predicates_of, def_id!()); } + DepKind::InferredOutlivesOf => { force!(outlives_of, def_id!()); } DepKind::SuperPredicatesOfItem => { force!(super_predicates_of, def_id!()); } DepKind::TraitDefOfItem => { force!(trait_def, def_id!()); } DepKind::AdtDefOfItem => { force!(adt_def, def_id!()); } From 98c6e0a02deb3b5efe1c06d1028502f45672a66e Mon Sep 17 00:00:00 2001 From: toidiu Date: Wed, 11 Oct 2017 10:18:57 -0400 Subject: [PATCH 8/8] fix function name --- src/librustc/ty/maps/plumbing.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/librustc/ty/maps/plumbing.rs b/src/librustc/ty/maps/plumbing.rs index 69a9a258d81..4e301342ee0 100644 --- a/src/librustc/ty/maps/plumbing.rs +++ b/src/librustc/ty/maps/plumbing.rs @@ -736,7 +736,7 @@ pub fn force_from_dep_node<'a, 'gcx, 'lcx>(tcx: TyCtxt<'a, 'gcx, 'lcx>, DepKind::TypeOfItem => { force!(type_of, def_id!()); } DepKind::GenericsOfItem => { force!(generics_of, def_id!()); } DepKind::PredicatesOfItem => { force!(predicates_of, def_id!()); } - DepKind::InferredOutlivesOf => { force!(outlives_of, def_id!()); } + DepKind::InferredOutlivesOf => { force!(inferred_outlives_of, def_id!()); } DepKind::SuperPredicatesOfItem => { force!(super_predicates_of, def_id!()); } DepKind::TraitDefOfItem => { force!(trait_def, def_id!()); } DepKind::AdtDefOfItem => { force!(adt_def, def_id!()); }