Defer evaluating type system constants when they use infers or params #140553
+523
−201
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
S-waiting-on-review
|
This PR changes a file inside |
Comment on lines
597
to
598
| } else if tcx.def_kind(uv.def) == DefKind::AnonConst | ||
| && let ty::AnonConstKind::RepeatExprCount = tcx.anon_const_kind(uv.def) |
There was a problem hiding this comment.
we're calling def_kind and anon_const_kind twice here -- can we dedup?
There was a problem hiding this comment.
ur true :3 can just split this out into a Option<AnonConstKind> local
There was a problem hiding this comment.
either that or merge both elses into a singular if tcx.def_kind() == anon_const { match tcx.anon_const_kind() { .. } }?
There was a problem hiding this comment.
Turned it into one big match, not quite what you said but I think this is also good. lmk what u think
This comment has been minimized.
This comment has been minimized.
BoxyUwU
force-pushed
the
defer_type_system_ctfe
branch
from
e276dd1 to
42f9d9a
Compare
This comment has been minimized.
This comment has been minimized.
BoxyUwU
force-pushed
the
defer_type_system_ctfe
branch
from
42f9d9a to
de3acb8
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Split out of #137972, the parts necessary for associated const equality and min generic const args to make progress and have correct semantics around when CTFE is invoked. According to a previous perf run of adding the new
const_arg_kindquery we should expect minor regressions here.I think this is acceptable as we should be able to remove this query relatively soon once mgca is more complete as we'll then be able to implement GCE in terms of mgca and rip out
GCEConstat which point it's trivial to determine what kind of anon const we're dealing with (either it has generics and is a repeat expr hack, or it doesnt and is a normal anon const).This should only affect unstable code as we handle repeat exprs specially and those are the only kinds of type system consts that are allowed to make use of generic parameters.
Fixes #133066
Fixes #133199
Fixes #136894
Fixes #137813
r? compiler-errors