Create const block DefIds in typeck instead of ast lowering #124650
Conversation
This file contains 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
The guarded call will ICE on its own. While this improved diagnostics in the presence of bugs somewhat, it is also a blocker to query feeding of constants. If this case is hit again, we should instead improve diagnostics of the root ICE
…am_attrs` This can cause query cycles in const eval, when const eval checks the ABI of functions, as mir_keys can depend on `typeck` to find all newly generated items (like const blocks)
rustbot
added
S-waiting-on-review
|
Some changes occurred in match checking cc @Nadrieril Some changes occurred to MIR optimizations cc @rust-lang/wg-mir-opt Changes to the size of AST and/or HIR nodes. cc @nnethercote |
|
@bors try @rust-timer queue |
|
Awaiting bors try build completion. @rustbot label: +S-waiting-on-perf |
rustbot
added
the
S-waiting-on-perf
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 3, 2024
Create const block DefIds in typeck instead of ast lowering r? `@ghost` this is a prerequisite for cleaning up pattern types and the range pattern HIR nodes in general. Right now they contain expressions, but they are supposed to only contain constants. In order to generate the anonymous constants lazily during typeck, we need to support generating new items with bodies during typeck in general. Transforming const blocks was the simplest change I could find to allow us to do that (everything else is much more invasive if we haven't already done it for const blocks).
oli-obk
commented
May 3, 2024
Comment on lines
-393
to
+392
| ty::InstanceDef::Item(def) => { | ||
| if ecx.tcx.is_ctfe_mir_available(def) { | ||
| Ok(ecx.tcx.mir_for_ctfe(def)) | ||
| } else if ecx.tcx.def_kind(def) == DefKind::AssocConst { | ||
| ecx.tcx.dcx().bug("This is likely a const item that is missing from its impl"); | ||
| } else { | ||
| // `find_mir_or_eval_fn` checks that this is a const fn before even calling us, | ||
| // so this should be unreachable. | ||
| let path = ecx.tcx.def_path_str(def); | ||
| bug!("trying to call extern function `{path}` at compile-time"); | ||
| } | ||
| } | ||
| ty::InstanceDef::Item(def) => Ok(ecx.tcx.mir_for_ctfe(def)), |
There was a problem hiding this comment.
is_ctfe_mir_available invokes mir_keys, which now invokes typeck, so we'd get cycles
|
The job Click to see the possible cause of the failure (guessed by this bot) |
|
The job Click to see the possible cause of the failure (guessed by this bot) |
|
💔 Test failed - checks-actions |
bors
added
S-waiting-on-author
|
☔ The latest upstream changes (presumably #124401) made this pull request unmergeable. Please resolve the merge conflicts. |
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.
r? @ghost
this is a prerequisite for cleaning up pattern types and the range pattern HIR nodes in general. Right now they contain expressions, but they are supposed to only contain constants. In order to generate the anonymous constants lazily during typeck, we need to support generating new items with bodies during typeck in general. Transforming const blocks was the simplest change I could find to allow us to do that (everything else is much more invasive if we haven't already done it for const blocks).