Don't cause a cycle when formatting query description that references a FnDef #107585
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
|
r? @oli-obk (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
A-query-system
oli-obk
reviewed
Feb 2, 2023
compiler-errors
commented
Feb 2, 2023
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 3, 2023
Rollup of 6 pull requests Successful merges: - rust-lang#107082 (Autotrait bounds on dyn-safe trait methods) - rust-lang#107427 (Add candidates for DiscriminantKind builtin) - rust-lang#107539 (Emit warnings on unused parens in index expressions) - rust-lang#107544 (Improve `TokenCursor`.) - rust-lang#107585 (Don't cause a cycle when formatting query description that references a FnDef) - rust-lang#107633 (Fix suggestion for coercing Option<&String> to Option<&str>) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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.
When a function returns
-> _, we use typeck to compute what the resulting type of the body should be. If we call another query inside of typeck and hit a cycle error, we attempt to report the cycle error which requires us to compute all of the query descriptions for the stack.However, if one of the queries in that cycle has a query description that references this function as a FnDef type, we'll cause a second cycle error from within the cycle error reporting code, since rendering a FnDef requires us to compute its signature. This causes an unwrap to ICE, since during the second cycle reporting code, we try to look for a job that isn't in the active jobs list.
We can avoid this by using
with_no_queries!when computing these query descriptions.Fixes #107089
The only drawback is that the rendering of opaque types in cycles regresses a bit :| I'm open to alternate suggestions about how we may handle this...