Skip to content

Ensure query keys are printed with reduced queries #141985

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.

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 2 commits into from
Jun 5, 2025

Conversation

compiler-errors
Copy link
Member

@compiler-errors compiler-errors commented Jun 3, 2025

Using -Z query-dep-graph and debug assertions leads to an ICE that was originally discovered in #141700:

This isn't an incremental bug per se, but instead a bug that has to do with debug printing query keys when debug assertions and -Z query-dep-graph is enabled. We end up printing a const (b/c we're using generic const args here) whose debug printing for -Z query-dep-graph requires invoking the same query cyclically 😃

I've pushed a commit which should fix this.

This isn't related to the standard library changes, but instead b/c it seems to be the first usage of feature(adt_const_params) in the standard library that ends up being triggered in incremental tests.

r? oli-obk

@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jun 3, 2025
@compiler-errors compiler-errors marked this pull request as ready for review June 3, 2025 21:00
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 3, 2025
@oli-obk
Copy link
Contributor

oli-obk commented Jun 4, 2025

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jun 4, 2025

📌 Commit cbb3a84 has been approved by oli-obk

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 4, 2025
bors added a commit that referenced this pull request Jun 5, 2025
Rollup of 11 pull requests

Successful merges:

 - #141890 (Add link to correct documentation in htmldocck.py)
 - #141932 (Fix for async drop inside async gen fn)
 - #141960 (Use non-2015 edition paths in tests that do not test for their resolution)
 - #141968 (Run wfcheck in one big loop instead of per module)
 - #141969 (Triagebot: Remove `assign.users_on_vacation`)
 - #141985 (Ensure query keys are printed with reduced queries)
 - #141999 (Visit the ident in `PreciseCapturingNonLifetimeArg`.)
 - #142005 (Change `tag_field` to `FieldIdx` in `Variants::Multiple`)
 - #142017 (Fix incorrect use of "recommend" over "recommended")
 - #142024 (Don't refer to 'this tail expression' in expansion.)
 - #142025 (Don't refer to 'local binding' in extern macro.)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 23ba088 into rust-lang:master Jun 5, 2025
10 checks passed
@rustbot rustbot added this to the 1.89.0 milestone Jun 5, 2025
rust-timer added a commit that referenced this pull request Jun 5, 2025
Rollup merge of #141985 - compiler-errors:cycle-in-dep-graph-print, r=oli-obk

Ensure query keys are printed with reduced queries

Using `-Z query-dep-graph` and debug assertions leads to an ICE that was originally discovered in #141700:

> This isn't an incremental bug per se, but instead a bug that has to do with debug printing query keys when debug assertions and `-Z query-dep-graph` is enabled. We end up printing a const (b/c we're using generic const args here) whose debug printing for -Z query-dep-graph requires invoking the same query cyclically 😃
>
> I've pushed a commit which should fix this.

This isn't related to the standard library changes, but instead b/c it seems to be the first usage of `feature(adt_const_params)` in the standard library that ends up being triggered in incremental tests.

r? oli-obk
@compiler-errors compiler-errors deleted the cycle-in-dep-graph-print branch June 7, 2025 15:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants