Skip to content

Fix cycle when debug-printing opaque types from RPITIT - #136806

Merged
bors merged 1 commit into
rust-lang:masterfrom
adwinwhite:cycle-in-pretty-print-rpitit
Feb 13, 2025
Merged

Fix cycle when debug-printing opaque types from RPITIT#136806
bors merged 1 commit into
rust-lang:masterfrom
adwinwhite:cycle-in-pretty-print-rpitit

Conversation

@adwinwhite

@adwinwhiteadwinwhite commented Feb 10, 2025

Copy link
Copy Markdown
Contributor

Extend #66594 to opaque types from RPITIT.

Before this PR, enabling debug logging like RUSTC_LOG="[check_type_bounds]" for code containing RPITIT produces a query cycle of explicit_item_bounds, as pretty printing for opaque type calls it.

@rustbot

rustbot commented Feb 10, 2025

Copy link
Copy Markdown
Collaborator

r? @estebank

rustbot has assigned @estebank.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Feb 10, 2025
compiler-errors
compiler-errors suggested changes Feb 10, 2025
View reviewed changes
Comment threadcompiler/rustc_hir_analysis/src/collect/item_bounds.rs Outdated
let opaque_ty = tcx.hir_node_by_def_id(opaque_def_id.expect_local()).expect_opaque_ty();
let bounds =
associated_type_bounds(tcx, def_id, opaque_ty.bounds, opaque_ty.span, filter);
let bounds = ty::print::with_reduced_queries!(associated_type_bounds(

@compiler-errorscompiler-errorsFeb 10, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please push this down into whatever debug call in associated_type_bounds is actually responsible for the cycle.

@adwinwhiteadwinwhiteFeb 11, 2025•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Inside associated_type_bounds, there are at least several debugging calls responsible for cycles on lowering functions.
Pushing with_reduced_queries down on them will affect other call sites that doesn't involve opaque types.

I didn't put it inside associated_type_bounds like opaque_type_boundsdoes for the same reason.

@compiler-errorscompiler-errorsFeb 11, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd rather you copy the opaque_type_bounds call then, it doesn't really matter if other call sites are affected

@adwinwhite
adwinwhiteforce-pushed the cycle-in-pretty-print-rpitit branch from 40eb78f to a634246CompareFebruary 11, 2025 04:35
estebank
estebank reviewed Feb 11, 2025
View reviewed changes
Comment threadcompiler/rustc_hir_analysis/src/collect/item_bounds.rs
@compiler-errors

compiler-errors commented Feb 12, 2025

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Feb 12, 2025

Copy link
Copy Markdown
Collaborator

📌 Commit a634246 has been approved by compiler-errors

It is now in the queue for this repository.

@borsbors 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 Feb 12, 2025
jhpratt added a commit to jhpratt/rust that referenced this pull request Feb 13, 2025
@jhpratt
Rollup merge ofrust-lang#136806- adwinwhite:cycle-in-pretty-print-r…
6f8ae75
…pitit, r=compiler-errors
Fix cycle when debug-printing opaque types from RPITIT
Extend rust-lang#66594 to opaque types from RPITIT.
Before this PR, enabling debug logging like `RUSTC_LOG="[check_type_bounds]"` for code containing RPITIT produces a query cycle of `explicit_item_bounds`, as pretty printing for opaque type calls [it](https://github.com/rust-lang/rust/blob/d9a4a47b8b3dc0bdff83360cea2013200d60d49c/compiler/rustc_middle/src/ty/print/pretty.rs#L1001).
This was referenced Feb 13, 2025
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 13, 2025
@bors
Auto merge ofrust-lang#136954- jhpratt:rollup-koefsot, r=jhpratt
9fcc9cf
Rollup of 12 pull requests
Successful merges:
- rust-lang#134090 (Stabilize target_feature_11)
- rust-lang#135025 (Cast allocas to default address space)
- rust-lang#135841 (Reject `?Trait` bounds in various places where we unconditionally warned since 1.0)
- rust-lang#136217 (Mark condition/carry bit as clobbered in C-SKY inline assembly)
- rust-lang#136699 (std: replace the `FromInner` implementation for addresses with private conversion functions)
- rust-lang#136806 (Fix cycle when debug-printing opaque types from RPITIT)
- rust-lang#136807 (compiler: internally merge `PtxKernel` into `GpuKernel`)
- rust-lang#136818 (Implement `read*_exact` for `std:io::repeat`)
- rust-lang#136927 (Correctly escape hashtags when running `invalid_rust_codeblocks` lint)
- rust-lang#136937 (Update books)
- rust-lang#136945 (Add diagnostic item for `std::io::BufRead`)
- rust-lang#136947 (Reinstate nnethercote in the review rotation.)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 03e2d7e into rust-lang:masterFeb 13, 2025
@rustbotrustbot added this to the 1.86.0 milestone Feb 13, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Feb 13, 2025
@rust-timer
Unrolled build forrust-lang#136806
c8da70a
Rollup merge of rust-lang#136806 - adwinwhite:cycle-in-pretty-print-rpitit, r=compiler-errors
Fix cycle when debug-printing opaque types from RPITIT
Extend rust-lang#66594 to opaque types from RPITIT.
Before this PR, enabling debug logging like `RUSTC_LOG="[check_type_bounds]"` for code containing RPITIT produces a query cycle of `explicit_item_bounds`, as pretty printing for opaque type calls [it](https://github.com/rust-lang/rust/blob/d9a4a47b8b3dc0bdff83360cea2013200d60d49c/compiler/rustc_middle/src/ty/print/pretty.rs#L1001).
@adwinwhite
adwinwhite deleted the cycle-in-pretty-print-rpitit branch February 13, 2025 12:53
bjorn3 pushed a commit to bjorn3/rust that referenced this pull request Feb 15, 2025
@bors
Auto merge ofrust-lang#136954- jhpratt:rollup-koefsot, r=jhpratt
f9116db
Rollup of 12 pull requests
Successful merges:
- rust-lang#134090 (Stabilize target_feature_11)
- rust-lang#135025 (Cast allocas to default address space)
- rust-lang#135841 (Reject `?Trait` bounds in various places where we unconditionally warned since 1.0)
- rust-lang#136217 (Mark condition/carry bit as clobbered in C-SKY inline assembly)
- rust-lang#136699 (std: replace the `FromInner` implementation for addresses with private conversion functions)
- rust-lang#136806 (Fix cycle when debug-printing opaque types from RPITIT)
- rust-lang#136807 (compiler: internally merge `PtxKernel` into `GpuKernel`)
- rust-lang#136818 (Implement `read*_exact` for `std:io::repeat`)
- rust-lang#136927 (Correctly escape hashtags when running `invalid_rust_codeblocks` lint)
- rust-lang#136937 (Update books)
- rust-lang#136945 (Add diagnostic item for `std::io::BufRead`)
- rust-lang#136947 (Reinstate nnethercote in the review rotation.)
r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@estebankestebankestebank left review comments
+1 more reviewer
@compiler-errorscompiler-errorscompiler-errors requested changes
Reviewers whose approvals may not affect merge requirements

Assignees

@compiler-errorscompiler-errors

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.86.0

Development

Successfully merging this pull request may close these issues.

5 participants

@adwinwhite@rustbot@compiler-errors@bors@estebank