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.

Sign up for GitHub

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

Jump to bottom

perf: Reuse the Elaborator used in outlives/ty.rs #67840

Closed
wants to merge 5 commits into from
Closed

perf: Reuse the Elaborator used in outlives/ty.rs #67840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f65dfa2
perf: Avoid allocating intermediate Vecs
Marwes Dec 30, 2019
85d9dae
perf: Reuse the Elaborator used in outlives/ty.rs
Marwes Jan 3, 2020
02d1504
fix docs
Marwes Jan 4, 2020
f7f40b9
refactor: Don't require a `RefCell` in VerifyBoundCx
Marwes Jan 4, 2020
365ccde
Hoist the reused Elaborator out so it actually gets reused
Marwes Jan 4, 2020
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
41 changes: 27 additions & 14 deletions src/librustc/infer/outlives/obligations.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
use crate::infer::outlives::env::RegionBoundPairs;
use crate::infer::outlives::verify::VerifyBoundCx;
use crate::infer::{self, GenericKind, InferCtxt, RegionObligation, SubregionOrigin, VerifyBound};
use crate::traits;
use crate::traits::ObligationCause;
use crate::ty::outlives::Component;
use crate::ty::subst::GenericArgKind;
Expand Down Expand Up @@ -154,6 +155,8 @@ impl<'cx, 'tcx> InferCtxt<'cx, 'tcx> {

let my_region_obligations = self.take_registered_region_obligations();

let mut elaborator = traits::Elaborator::new(self.tcx);

for (body_id, RegionObligation { sup_type, sub_region, origin }) in my_region_obligations {
debug!(
"process_registered_region_obligations: sup_type={:?} sub_region={:?} origin={:?}",
Expand All @@ -169,6 +172,7 @@ impl<'cx, 'tcx> InferCtxt<'cx, 'tcx> {
&region_bound_pairs,
implicit_region_bound,
param_env,
&mut elaborator,
);
outlives.type_must_outlive(origin, sup_type, sub_region);
} else {
Expand All @@ -191,15 +195,16 @@ impl<'cx, 'tcx> InferCtxt<'cx, 'tcx> {
ty: Ty<'tcx>,
region: ty::Region<'tcx>,
) {
let outlives = &mut TypeOutlives::new(
let ty = self.resolve_vars_if_possible(&ty);
TypeOutlives::new(
self,
self.tcx,
region_bound_pairs,
implicit_region_bound,
param_env,
);
let ty = self.resolve_vars_if_possible(&ty);
outlives.type_must_outlive(origin, ty, region);
&mut traits::Elaborator::new(self.tcx),
)
.type_must_outlive(origin, ty, region);
}
}

Expand All @@ -209,15 +214,15 @@ impl<'cx, 'tcx> InferCtxt<'cx, 'tcx> {
/// via a "delegate" of type `D` -- this is usually the `infcx`, which
/// accrues them into the `region_obligations` code, but for NLL we
/// use something else.
pub struct TypeOutlives<'cx, 'tcx, D>
pub struct TypeOutlives<'cx, 'tcx, 'e, D>
where
D: TypeOutlivesDelegate<'tcx>,
{
// See the comments on `process_registered_region_obligations` for the meaning
// of these fields.
delegate: D,
tcx: TyCtxt<'tcx>,
verify_bound: VerifyBoundCx<'cx, 'tcx>,
verify_bound: VerifyBoundCx<'cx, 'tcx, 'e>,
}

pub trait TypeOutlivesDelegate<'tcx> {
Expand All @@ -237,7 +242,7 @@ pub trait TypeOutlivesDelegate<'tcx> {
);
}

impl<'cx, 'tcx, D> TypeOutlives<'cx, 'tcx, D>
impl<'cx, 'tcx, 'e, D> TypeOutlives<'cx, 'tcx, 'e, D>
where
D: TypeOutlivesDelegate<'tcx>,
{
Expand All @@ -247,6 +252,7 @@ where
region_bound_pairs: &'cx RegionBoundPairs<'tcx>,
implicit_region_bound: Option<ty::Region<'tcx>>,
param_env: ty::ParamEnv<'tcx>,
elaborator: &'e mut traits::Elaborator<'tcx>,
) -> Self {
Self {
delegate,
Expand All @@ -256,6 +262,7 @@ where
region_bound_pairs,
implicit_region_bound,
param_env,
elaborator,
),
}
}
Expand All @@ -273,7 +280,9 @@ where
origin: infer::SubregionOrigin<'tcx>,
ty: Ty<'tcx>,
region: ty::Region<'tcx>,
) {
) where
'tcx: 'e,
{
debug!("type_must_outlive(ty={:?}, region={:?}, origin={:?})", ty, region, origin);

assert!(!ty.has_escaping_bound_vars());
Expand All @@ -288,8 +297,10 @@ where
origin: infer::SubregionOrigin<'tcx>,
components: &[Component<'tcx>],
region: ty::Region<'tcx>,
) {
for component in components.iter() {
) where
'tcx: 'e,
{
for component in components {
let origin = origin.clone();
match component {
Component::Region(region1) => {
Expand Down Expand Up @@ -338,7 +349,9 @@ where
origin: infer::SubregionOrigin<'tcx>,
region: ty::Region<'tcx>,
projection_ty: ty::ProjectionTy<'tcx>,
) {
) where
'tcx: 'e,
{
debug!(
"projection_must_outlive(region={:?}, projection_ty={:?}, origin={:?})",
region, projection_ty, origin
Expand Down Expand Up @@ -367,8 +380,8 @@ where
// Compute the bounds we can derive from the environment. This
// is an "approximate" match -- in some cases, these bounds
// may not apply.
let mut approx_env_bounds =
self.verify_bound.projection_approx_declared_bounds_from_env(projection_ty);
let mut approx_env_bounds: Vec<_> =
self.verify_bound.projection_approx_declared_bounds_from_env(projection_ty).collect();
debug!("projection_must_outlive: approx_env_bounds={:?}", approx_env_bounds);

// Remove outlives bounds that we get from the environment but
Expand Down Expand Up @@ -454,7 +467,7 @@ where
}
}

impl<'cx, 'tcx> TypeOutlivesDelegate<'tcx> for &'cx InferCtxt<'cx, 'tcx> {
impl<'cx, 'tcx> TypeOutlivesDelegate<'tcx> for &'_ InferCtxt<'cx, 'tcx> {
fn push_sub_region_constraint(
&mut self,
origin: SubregionOrigin<'tcx>,
Expand Down
Loading