Skip to content

Fix an issue with const inference variables sticking around under Chalk + NLL #65696

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 5 commits into from
Oct 24, 2019
Merged

Fix an issue with const inference variables sticking around under Chalk + NLL #65696

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9220558
Fix an issue with const inference variables sticking around under Cha…
varkor Oct 22, 2019
51c6874
Add regression test for #65675
varkor Oct 22, 2019
cc7294c
Add regression test for #62579
varkor Oct 23, 2019
12f68e6
Account for const generalisation in combine
varkor Oct 23, 2019
624e34a
Account for const generalisation in nll_relate
varkor Oct 23, 2019
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
Account for const generalisation in combine
  • Loading branch information
@varkor
varkor committed Oct 23, 2019
commit 12f68e6987c4669b90a6cdac1643b99b6c677aea
18 changes: 15 additions & 3 deletions src/librustc/infer/combine.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,9 +605,21 @@ impl TypeRelation<'tcx> for Generalizer<'_, 'tcx> {
match c.val {
ConstValue::Infer(InferConst::Var(vid)) => {
let mut variable_table = self.infcx.const_unification_table.borrow_mut();
match variable_table.probe_value(vid).val.known() {
Some(u) => self.relate(&u, &u),
None => Ok(c),
let var_value = variable_table.probe_value(vid);
match var_value.val {
ConstVariableValue::Known { value: u } => self.relate(&u, &u),
ConstVariableValue::Unknown { universe } => {
if self.for_universe.can_name(universe) {
Ok(c)
} else {
let new_var_id = variable_table.new_key(ConstVarValue {
origin: var_value.origin,
val: ConstVariableValue::Unknown { universe: self.for_universe },
});
let u = self.tcx().mk_const_var(new_var_id, c.ty);
return Ok(u);
}
}
}
}
_ => relate::super_relate_consts(self, c, c),
Expand Down