Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Lazy normalization of constants (Reprise) #71973

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

Merged
merged 16 commits into from
May 19, 2020
Merged

Lazy normalization of constants (Reprise) #71973

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
8b14b84
Assume unevaluated consts are equal to the other consts and add Const…
skinnyBat Feb 28, 2020
4cfdd21
Emit `ConstEquate` obligation after checking/unifying for inference v…
skinnyBat Jan 2, 2020
3ef8310
Add lazy normalization tests
skinnyBat Jan 4, 2020
93d15b9
Put lazy normalization behind a feature gate
skinnyBat Jan 4, 2020
c3a0cba
initial cleanup
lcnr May 5, 2020
e1a8d32
keep the good old lazy_normalization hack alive
lcnr May 5, 2020
afd7ea8
update tests and add relevant feature gate test
lcnr May 5, 2020
e873eef
explicitly handle errors in fulfill
lcnr May 7, 2020
479968b
explicitly handle errors in `select`
lcnr May 7, 2020
443ae83
merge lazy_normalization_consts into const_generics
lcnr May 15, 2020
0f7bf5d
add docs
lcnr May 8, 2020
3d7637e
correctly handle escaping bound variables
lcnr May 8, 2020
c714397
chalk
lcnr May 12, 2020
752d8a2
the best way to fix bugs is by ignoring them
lcnr May 12, 2020
6a72ba4
Logically seperate lazy norm from `const_generics`
lcnr May 17, 2020
9da8a5b
update tests
lcnr May 17, 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
Prev Previous commit
Next Next commit
correctly handle escaping bound variables
  • Loading branch information
@lcnr
lcnr committed May 17, 2020
commit 3d7637e66de5dea270d729c4bbea1237b140e246
14 changes: 11 additions & 3 deletions src/librustc_infer/infer/combine.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ use rustc_hir::def_id::DefId;
use rustc_middle::ty::error::TypeError;
use rustc_middle::ty::relate::{self, Relate, RelateResult, TypeRelation};
use rustc_middle::ty::subst::SubstsRef;
use rustc_middle::ty::{self, InferConst, Ty, TyCtxt};
use rustc_middle::ty::{self, InferConst, Ty, TyCtxt, TypeFoldable};
use rustc_middle::ty::{IntType, UintType};
use rustc_span::{Span, DUMMY_SP};

Expand Down Expand Up @@ -165,11 +165,19 @@ impl<'infcx, 'tcx> InferCtxt<'infcx, 'tcx> {
return self.unify_const_variable(!a_is_expected, vid, a);
}
(ty::ConstKind::Unevaluated(..), _) if self.tcx.features().const_generics => {
relation.const_equate_obligation(a, b);
// FIXME(#59490): Need to remove the leak check to accomodate
// escaping bound variables here.
if !a.has_escaping_bound_vars() && !b.has_escaping_bound_vars() {
relation.const_equate_obligation(a, b);
}
return Ok(b);
}
(_, ty::ConstKind::Unevaluated(..)) if self.tcx.features().const_generics => {
relation.const_equate_obligation(a, b);
// FIXME(#59490): Need to remove the leak check to accomodate
// escaping bound variables here.
if !a.has_escaping_bound_vars() && !b.has_escaping_bound_vars() {
relation.const_equate_obligation(a, b);
}
return Ok(a);
}
_ => {}
Expand Down