Set groundwork for proper const normalization #140549
Conversation
rustbot
added
S-waiting-on-review
|
changes to the core type system Some changes occurred in match checking cc @Nadrieril |
| // system consts that we can retrieve with some `query const_arg_of_alias` query. Evaluating the | ||
| // constant is "close enough" to getting the actual rhs of the const item for now even if it might | ||
| // lead to some cycles | ||
| super::evaluate_const(selcx.infcx, alias_ct, param_env) |
There was a problem hiding this comment.
feature(associated_const_equality) might be a bit more cycle prone now due to evaluating here instead of normalizing to the impl definition and then evaluating? All the tests still pass though so I guess its fine- and both this and the previous way it worked can't stick around long term anyway.
|
merge conflicts :despair: |
Kinda, I had to change stuff from being working on AliasTy to AliasTerm so there's some minor changes for getting the types to line up, but behaviourally speaking it should be the same. I originally had it as its own commit but honestly it didn't really seem to matter much when I was looking over the changes because I had to switch from AliasTy to AliasKind at the same time 🤔 though i guess i could have just not done that... okay lemme split this up |
|
Okay first commit should contain no changes to the norm logic other than replacing the two match arms with an if/else. Second commit should be able to be reviewed to see the actual changes to the logic |
This comment has been minimized.
This comment has been minimized.
|
Oh |
|
This PR changes a file inside |
|
One of the crashes tests is also fixed by #140553 and in an actually principled way so I've just removed it and will let that PR add the test (which ive verified still ICEs under this PR). The other test I've updated to still reproduce since this PR doesn't really fix it afaik |
| self.obligations.extend( | ||
| infcx.tcx.predicates_of(free.def_id).instantiate_own(infcx.tcx, free.args).map( | ||
| |(mut predicate, span)| { | ||
| if free.has_escaping_bound_vars() { |
There was a problem hiding this comment.
why do that if free has escaping bound vars instead of checking the predicate?
There was a problem hiding this comment.
seems generally wrong to be instantiating early binders with bound vars, going to open an issue about this
BoxyUwU
force-pushed
the
proper_const_norm
branch
3 times, most recently
from
5ea4762 to
5fb578e
Compare
|
@bors r+ rollup=iffy |
bors
added
S-waiting-on-bors
Set groundwork for proper const normalization r? lcnr Updates a lot of our normalization/alias infrastructure to be setup to handle mgca aliases and normalization once const items are represented more like aliases than bodies. Inherent associated consts are still super busted, I didn't update the assertions that IACs the right arg setup because that winds up being somewhat involved to do *before* proper support for normalizing const aliases is implemented. I dont *intend* for this to have any effect on stable. We continue normalizing via ctfe on stable and the codepaths in `project` for consts should only be reachable with mgca or ace.
r? lcnr
Updates a lot of our normalization/alias infrastructure to be setup to handle mgca aliases and normalization once const items are represented more like aliases than bodies. Inherent associated consts are still super busted, I didn't update the assertions that IACs the right arg setup because that winds up being somewhat involved to do before proper support for normalizing const aliases is implemented.
I dont intend for this to have any effect on stable. We continue normalizing via ctfe on stable and the codepaths in
projectfor consts should only be reachable with mgca or ace.