Skip to content

Flush errors before deep normalize in dropck_outlives #140947

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
May 16, 2025
Merged

Flush errors before deep normalize in dropck_outlives #140947

merged 2 commits into from
May 16, 2025

Conversation

compiler-errors
Copy link
Member

Deep normalization doesn't allow the ocx to have pending obligations, so process them before deeply normalizing.

Fixes #140931
Fixes #140462

@rustbot
Copy link
Collaborator

rustbot commented May 12, 2025

r? @petrochenkov

rustbot has assigned @petrochenkov.
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

@rustbot rustbot 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 May 12, 2025
@compiler-errors
Copy link
Member Author

r? lcnr

@rustbot rustbot assigned lcnr and unassigned petrochenkov May 12, 2025
@lcnr
Copy link
Contributor

lcnr commented May 12, 2025

@bors r+ rollup

@lcnr
Copy link
Contributor

lcnr commented May 12, 2025

@bors r-

@bors
Copy link
Collaborator

bors commented May 12, 2025

📌 Commit e2b4654 has been approved by lcnr

It is now in the queue for this repository.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. 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. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 12, 2025
lcnr
lcnr reviewed May 12, 2025
View reviewed changes
compiler/rustc_trait_selection/src/traits/query/dropck_outlives.rs Outdated
if !errors.is_empty() {
return Err(errors);
}

ocx.deeply_normalize(&cause, param_env, ty)?;

let errors = ocx.select_where_possible();
Copy link
Contributor

@lcnr lcnr May 12, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

are these errors always empty now?

Copy link
Member Author

Choose a reason for hiding this comment

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

yeah

Copy link
Member Author

Choose a reason for hiding this comment

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

reworked this code a bit b/c it was kinda goofy, returning Err(vec![]) in case deep normalization succeeded.

lcnr
lcnr reviewed May 13, 2025
View reviewed changes
compiler/rustc_trait_selection/src/traits/query/dropck_outlives.rs
let errors = ocx.select_where_possible();
debug!("normalize errors: {ty} ~> {errors:#?}");
return Err(errors);
match ocx.deeply_normalize(&cause, param_env, ty) {
Copy link
Contributor

Choose a reason for hiding this comment

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

pls add comment that we do this match to get FulfillmentErrors to report in case query_normalize failed to avoid ICE due to a delayed bug

@lcnr
Copy link
Contributor

lcnr commented May 15, 2025

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented May 15, 2025

📌 Commit a508011 has been approved by lcnr

It is now in the queue for this repository.

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 15, 2025
@matthiaskrgr
Rollup merge of rust-lang#140947 - compiler-errors:pending-norm, r=lcnr
fd9c5d2 
Flush errors before deep normalize in `dropck_outlives`

Deep normalization doesn't allow the ocx to have pending obligations, so process them before deeply normalizing.

Fixes rust-lang#140931
Fixes rust-lang#140462
@matthiaskrgr matthiaskrgr mentioned this pull request May 15, 2025
Closed
compiler-errors added a commit to compiler-errors/rust that referenced this pull request May 15, 2025
@compiler-errors
Rollup merge of rust-lang#140947 - compiler-errors:pending-norm, r=lcnr
0904424 
Flush errors before deep normalize in `dropck_outlives`

Deep normalization doesn't allow the ocx to have pending obligations, so process them before deeply normalizing.

Fixes rust-lang#140931
Fixes rust-lang#140462
@compiler-errors compiler-errors mentioned this pull request May 15, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request May 15, 2025
@bors
Auto merge of rust-lang#141041 - compiler-errors:rollup-tz4bpbf, r=co…
622f000 
…mpiler-errors

Rollup of 14 pull requests

Successful merges:

 - rust-lang#139749 (docs(library/core/src/pin): fix typo "necessarily" -> "necessary")
 - rust-lang#140130 (Add LLDB providers for BTreeMap and BTreeSet)
 - rust-lang#140685 (Simplify `Vec::as_non_null` implementation and make it `const`)
 - rust-lang#140712 (normalization: avoid incompletely constraining GAT args)
 - rust-lang#140768 (Improve `dangerous_implicit_aurorefs` diagnostic output)
 - rust-lang#140834 (move (or remove) some impl Trait tests)
 - rust-lang#140910 (Remove `stable` attribute from wasi fs (read_exact|write_all)_at)
 - rust-lang#140947 (Flush errors before deep normalize in `dropck_outlives`)
 - rust-lang#140966 (Remove #![feature(let_chains)] from library and src/librustdoc)
 - rust-lang#140977 ([win] Use a dash instead of slash for linker to avoid breaking lld)
 - rust-lang#140990 (VxWorks: updates from recent libc versions)
 - rust-lang#141003 (Improve ternary operator recovery)
 - rust-lang#141013 (Implement methods to set STARTUPINFO flags for Command API on Windows)
 - rust-lang#141026 (rustc-dev-guide subtree update)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request May 15, 2025
@bors
Auto merge of rust-lang#141040 - matthiaskrgr:rollup-rym8mkn, r=matth…
985d931 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#139749 (docs(library/core/src/pin): fix typo "necessarily" -> "necessary")
 - rust-lang#140685 (Simplify `Vec::as_non_null` implementation and make it `const`)
 - rust-lang#140712 (normalization: avoid incompletely constraining GAT args)
 - rust-lang#140768 (Improve `dangerous_implicit_aurorefs` diagnostic output)
 - rust-lang#140947 (Flush errors before deep normalize in `dropck_outlives`)
 - rust-lang#140966 (Remove #![feature(let_chains)] from library and src/librustdoc)
 - rust-lang#140990 (VxWorks: updates from recent libc versions)
 - rust-lang#141027 (remove `RustfmtState` to reduce `initial_rustfmt` complexity)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr mentioned this pull request May 15, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 15, 2025
@bors
Auto merge of rust-lang#141050 - matthiaskrgr:rollup-uyzqbmj, r=matth…
6d1875f 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#139749 (docs(library/core/src/pin): fix typo "necessarily" -> "necessary")
 - rust-lang#140685 (Simplify `Vec::as_non_null` implementation and make it `const`)
 - rust-lang#140712 (normalization: avoid incompletely constraining GAT args)
 - rust-lang#140768 (Improve `dangerous_implicit_aurorefs` diagnostic output)
 - rust-lang#140947 (Flush errors before deep normalize in `dropck_outlives`)
 - rust-lang#140990 (VxWorks: updates from recent libc versions)
 - rust-lang#141027 (remove `RustfmtState` to reduce `initial_rustfmt` complexity)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit d0ea342 into rust-lang:master May 16, 2025
6 checks passed
@rustbot rustbot added this to the 1.89.0 milestone May 16, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request May 16, 2025
@rust-timer
Unrolled build for rust-lang#140947
8793646 
Rollup merge of rust-lang#140947 - compiler-errors:pending-norm, r=lcnr

Flush errors before deep normalize in `dropck_outlives`

Deep normalization doesn't allow the ocx to have pending obligations, so process them before deeply normalizing.

Fixes rust-lang#140931
Fixes rust-lang#140462
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lcnr lcnr lcnr left review comments

Assignees

@lcnr lcnr

Labels
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
Milestone
1.89.0
5 participants
@compiler-errors @rustbot @lcnr @bors @petrochenkov