fix(query): Pass Query Key to `value_from_cycle_error` by TKanX · Pull Request #153694 · rust-lang/rust

TKanX · 2026-03-11T06:57:04Z

Summary:

Pass the query key directly to value_from_cycle_error so that FromCycleError impls (notably FnSig) can use the recovered query's DefId instead of relying on cycle[0], which is arbitrarily rotated by the parallel deadlock handler.

As suggested in #153644 (comment).

Closes #153391

r? @nnethercote
cc @zetanumbers

rustbot · 2026-03-11T06:57:08Z

Failed to set assignee to zetanumbers: invalid assignee

Note: Only org members with at least the repository "read" role, users with write permissions, or people who have commented on the PR may be assigned.

zetanumbers · 2026-03-11T08:41:44Z

This needs a rebase, sorry for an inconvenience. You are a half way there, but you would need to remove QueryKey::key_as_def_id call you have added and use query key directly to extract the function's arity within rustc_query_impl::from_cycle_error::fn_sig.

zetanumbers · 2026-03-11T08:50:49Z

@rustbot author

rustbot · 2026-03-11T08:50:55Z

Reminder, once the PR becomes ready for a review, use @rustbot ready.

nnethercote · 2026-03-11T10:16:13Z

FYI: #153707 is also changing this code, replacing the guar parameter with err. It is compatible with this change, but whichever PR merges first will cause conflicts with the other. Apologies for any confusion, I didn't realize @zetanumbers was handing out pieces of this work to other people.

zetanumbers · 2026-03-11T10:22:01Z

I had done some recruitment into query system. I thought it was clear from #153493 (comment)

zetanumbers · 2026-03-11T10:29:14Z

This PR also fixes #142064 as we no longer rely on a reported query cycle and whatever permutation it has, which was the source of that problem.

zetanumbers · 2026-03-11T10:31:03Z

LGTM

zetanumbers · 2026-03-11T10:43:01Z

@bors ready

If only I could've

rust-bors · 2026-03-11T10:43:05Z

Unknown command "ready". Run @bors help to see available commands.

@nnethercote

…nnethercote fix(query): Pass Query Key to `value_from_cycle_error` ### Summary: Pass the query key directly to `value_from_cycle_error` so that `FromCycleError` impls (notably `FnSig`) can use the recovered query's `DefId` instead of relying on `cycle[0]`, which is arbitrarily rotated by the parallel deadlock handler. As suggested in [#153644 (comment)](#153644 (comment)). Closes #153391 r? @nnethercote cc @zetanumbers

rust-bors · 2026-03-12T04:20:10Z

💔 Test for ecf0b12 failed: CI. Failed job:

auto - x86_64-gnu-llvm-21-3 (web logs, enhanced plaintext logs)

nnethercote · 2026-03-12T04:33:16Z

GitHub flakiness.

@bors retry

@nnethercote

…y-param, r=nnethercote fix(query): Pass Query Key to `value_from_cycle_error` ### Summary: Pass the query key directly to `value_from_cycle_error` so that `FromCycleError` impls (notably `FnSig`) can use the recovered query's `DefId` instead of relying on `cycle[0]`, which is arbitrarily rotated by the parallel deadlock handler. As suggested in [rust-lang#153644 (comment)](rust-lang#153644 (comment)). Closes rust-lang#153391 r? @nnethercote cc @zetanumbers

rust-log-analyzer · 2026-03-12T05:23:10Z

A job failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@nnethercote

…y-param, r=nnethercote fix(query): Pass Query Key to `value_from_cycle_error` ### Summary: Pass the query key directly to `value_from_cycle_error` so that `FromCycleError` impls (notably `FnSig`) can use the recovered query's `DefId` instead of relying on `cycle[0]`, which is arbitrarily rotated by the parallel deadlock handler. As suggested in [rust-lang#153644 (comment)](rust-lang#153644 (comment)). Closes rust-lang#153391 r? @nnethercote cc @zetanumbers

Rollup of 7 pull requests Successful merges: - #153736 (add test that an incomplete feature emits a warning) - #153160 (Fix relative extern URL depth on source pages) - #153432 (Fix some comments about dataflow analysis.) - #153694 (fix(query): Pass Query Key to `value_from_cycle_error`) - #153717 (unused_macro_rules switched used and unused comments) - #153748 (editorconfig: css uses tabs) - #153750 (rustc-dev-guide subtree update)

nnethercote · 2026-03-12T09:08:48Z

@bors retry

rust-bors · 2026-03-12T09:08:51Z

❗ You can only retry pull requests that are approved and have a previously failed auto build.

@nnethercote

…y-param, r=nnethercote fix(query): Pass Query Key to `value_from_cycle_error` ### Summary: Pass the query key directly to `value_from_cycle_error` so that `FromCycleError` impls (notably `FnSig`) can use the recovered query's `DefId` instead of relying on `cycle[0]`, which is arbitrarily rotated by the parallel deadlock handler. As suggested in [rust-lang#153644 (comment)](rust-lang#153644 (comment)). Closes rust-lang#153391 r? @nnethercote cc @zetanumbers

Rollup of 11 pull requests Successful merges: - #153726 (Add optional CI job to build the compiler with the parallel frontend) - #153763 (Don't add empty target features for target-cpu=native on macOS) - #153432 (Fix some comments about dataflow analysis.) - #153529 (Fix LegacyKeyValueFormat report from docker build: pr) - #153694 (fix(query): Pass Query Key to `value_from_cycle_error`) - #153708 (de-non_const `Iterator` trait methods) - #153717 (unused_macro_rules switched used and unused comments) - #153736 (add test that an incomplete feature emits a warning) - #153748 (editorconfig: css uses tabs) - #153750 (rustc-dev-guide subtree update) - #153762 (actually make the is-fn test test what it says it tests)

Zalathar · 2026-03-12T11:28:40Z

Investigating Rollup of 11 pull requests #153767 (comment)

@bors try jobs=x86_64-rust-for-linux

…<try> fix(query): Pass Query Key to `value_from_cycle_error` try-job: x86_64-rust-for-linux

@nnethercote

…y-param, r=nnethercote fix(query): Pass Query Key to `value_from_cycle_error` ### Summary: Pass the query key directly to `value_from_cycle_error` so that `FromCycleError` impls (notably `FnSig`) can use the recovered query's `DefId` instead of relying on `cycle[0]`, which is arbitrarily rotated by the parallel deadlock handler. As suggested in [rust-lang#153644 (comment)](rust-lang#153644 (comment)). Closes rust-lang#153391 r? @nnethercote cc @zetanumbers

…uwer Rollup of 10 pull requests Successful merges: - #153726 (Add optional CI job to build the compiler with the parallel frontend) - #153763 (Don't add empty target features for target-cpu=native on macOS) - #153432 (Fix some comments about dataflow analysis.) - #153529 (Fix LegacyKeyValueFormat report from docker build: pr) - #153694 (fix(query): Pass Query Key to `value_from_cycle_error`) - #153717 (unused_macro_rules switched used and unused comments) - #153736 (add test that an incomplete feature emits a warning) - #153748 (editorconfig: css uses tabs) - #153750 (rustc-dev-guide subtree update) - #153762 (actually make the is-fn test test what it says it tests)

rust-bors · 2026-03-12T12:32:19Z

☀️ Try build successful (CI)
Build commit: 2d2b643 (2d2b643a7715fbf3cec5cd7f6831d0cea0d1300c, parent: d1ee5e59a964a419b84b760812a35075034f4861)

This comment has been minimized.

Sign in to view

rustbot assigned nnethercote Mar 11, 2026

TKanX force-pushed the bugfix/153391-cycle-error-key-param branch from c1f26e9 to 6118290 Compare March 11, 2026 07:05

TKanX marked this pull request as ready for review March 11, 2026 08:13

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 11, 2026

This comment has been minimized.

Sign in to view

zetanumbers mentioned this pull request Mar 11, 2026

Remove FromCycleError trait #153493

Merged

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 11, 2026

TKanX marked this pull request as draft March 11, 2026 09:29

TKanX force-pushed the bugfix/153391-cycle-error-key-param branch from 6118290 to 5986684 Compare March 11, 2026 09:56

TKanX marked this pull request as ready for review March 11, 2026 09:57

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 11, 2026

This comment has been minimized.

Sign in to view

rust-bors bot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 12, 2026

rust-bors bot 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 Mar 12, 2026

Zalathar mentioned this pull request Mar 12, 2026

Rollup of 5 pull requests #153757

Closed

Zalathar mentioned this pull request Mar 12, 2026

Rollup of 7 pull requests #153761

Closed

zetanumbers approved these changes Mar 12, 2026

View reviewed changes

Zalathar mentioned this pull request Mar 12, 2026

Rollup of 11 pull requests #153767

Closed

This comment has been minimized.

Sign in to view

rust-bors bot pushed a commit that referenced this pull request Mar 12, 2026

Auto merge of #153694 - TKanX:bugfix/153391-cycle-error-key-param, r=…

2d2b643

…<try> fix(query): Pass Query Key to `value_from_cycle_error` try-job: x86_64-rust-for-linux

JonathanBrouwer mentioned this pull request Mar 12, 2026

Rollup of 10 pull requests #153770

Merged

Zalathar mentioned this pull request Mar 12, 2026

Rollup of 10 pull requests #153771

Closed

rust-bors bot merged commit 04cf753 into rust-lang:main Mar 12, 2026
12 of 13 checks passed

rustbot added this to the 1.96.0 milestone Mar 12, 2026

Uh oh!

Conversation

TKanX commented Mar 11, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary:

Uh oh!

rustbot commented Mar 11, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

zetanumbers commented Mar 11, 2026

Uh oh!

zetanumbers commented Mar 11, 2026

Uh oh!

rustbot commented Mar 11, 2026

Uh oh!

This comment has been minimized.

nnethercote commented Mar 11, 2026

Uh oh!

zetanumbers commented Mar 11, 2026

Uh oh!

zetanumbers commented Mar 11, 2026

Uh oh!

zetanumbers commented Mar 11, 2026

Uh oh!

zetanumbers commented Mar 11, 2026

Uh oh!

rust-bors bot commented Mar 11, 2026

Uh oh!

This comment has been minimized.

rust-bors bot commented Mar 12, 2026

Uh oh!

nnethercote commented Mar 12, 2026

Uh oh!

rust-log-analyzer commented Mar 12, 2026

Uh oh!

nnethercote commented Mar 12, 2026

Uh oh!

rust-bors bot commented Mar 12, 2026

Uh oh!

Zalathar commented Mar 12, 2026

Uh oh!

This comment has been minimized.

rust-bors bot commented Mar 12, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

TKanX commented Mar 11, 2026 •

edited by rustbot

Loading