Skip to content
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

-Znext-solver: eagerly normalize when adding goals #125343

Merged
merged 4 commits into from
May 28, 2024

Conversation

lcnr
Copy link
Contributor

@lcnr lcnr commented May 20, 2024

fixes #125269. I am not totally with this fix and going to keep this open until we have a more general discussion about how to handle hangs caused by lazy norm in the new solver.

@lcnr
Copy link
Contributor Author

lcnr commented May 20, 2024

r? @compiler-errors

@rustbot
Copy link
Collaborator

rustbot commented May 20, 2024

r? @cjgillot

rustbot has assigned @cjgillot.
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 assigned compiler-errors and unassigned cjgillot May 20, 2024
@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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels May 20, 2024
@rust-cloud-vms rust-cloud-vms bot force-pushed the eagerly-normalize-added-goals branch from 413c979 to 9aa8308 Compare May 21, 2024 19:56
@lcnr lcnr marked this pull request as ready for review May 21, 2024 19:57
@rustbot
Copy link
Collaborator

rustbot commented May 21, 2024

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

@compiler-errors
Copy link
Member

We discussed this, I'm happy with landing this for now I guess.

We should track this optimization somewhere (ideally with a label in the new solver repo) so we can revisit it.

@bors r+

@bors
Copy link
Contributor

bors commented May 22, 2024

📌 Commit 9aa8308 has been approved by compiler-errors

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 May 22, 2024
@lcnr
Copy link
Contributor Author

lcnr commented May 22, 2024

@compiler-errors
Copy link
Member

@bors r-

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 22, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request May 24, 2024
…r=<try>

drop region constraints for ambiguous goals

See the comment in `compute_external_query_constraints`. While the underlying issue is preexisting, this fixes a bug introduced by rust-lang#125343.

It slightly weakens the leak chec, even if we didn't have any test which was affected. I want to write such a test before merging this PR.

r? `@compiler-errors`
@bors
Copy link
Contributor

bors commented May 25, 2024

☔ The latest upstream changes (presumably #125541) made this pull request unmergeable. Please resolve the merge conflicts.

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 25, 2024
…, r=compiler-errors

drop region constraints for ambiguous goals

See the comment in `compute_external_query_constraints`. While the underlying issue is preexisting, this fixes a bug introduced by rust-lang#125343.

It slightly weakens the leak chec, even if we didn't have any test which was affected. I want to write such a test before merging this PR.

r? `@compiler-errors`
fmease added a commit to fmease/rust that referenced this pull request May 26, 2024
…, r=compiler-errors

drop region constraints for ambiguous goals

See the comment in `compute_external_query_constraints`. While the underlying issue is preexisting, this fixes a bug introduced by rust-lang#125343.

It slightly weakens the leak chec, even if we didn't have any test which was affected. I want to write such a test before merging this PR.

r? ``@compiler-errors``
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 26, 2024
…, r=compiler-errors

drop region constraints for ambiguous goals

See the comment in `compute_external_query_constraints`. While the underlying issue is preexisting, this fixes a bug introduced by rust-lang#125343.

It slightly weakens the leak chec, even if we didn't have any test which was affected. I want to write such a test before merging this PR.

r? `@compiler-errors`
bors added a commit to rust-lang-ci/rust that referenced this pull request May 26, 2024
…r=compiler-errors

drop region constraints for ambiguous goals

See the comment in `compute_external_query_constraints`. While the underlying issue is preexisting, this fixes a bug introduced by rust-lang#125343.

It slightly weakens the leak chec, even if we didn't have any test which was affected. I want to write such a test before merging this PR.

r? `@compiler-errors`
bors added a commit to rust-lang-ci/rust that referenced this pull request May 27, 2024
…r=compiler-errors

drop region constraints for ambiguous goals

See the comment in `compute_external_query_constraints`. While the underlying issue is preexisting, this fixes a bug introduced by rust-lang#125343.

It slightly weakens the leak chec, even if we didn't have any test which was affected. I want to write such a test before merging this PR.

r? `@compiler-errors`
@rust-cloud-vms rust-cloud-vms bot force-pushed the eagerly-normalize-added-goals branch from 9aa8308 to 98bfd54 Compare May 28, 2024 04:54
@lcnr
Copy link
Contributor Author

lcnr commented May 28, 2024

@bors r=compiler-errors rollup

@bors
Copy link
Contributor

bors commented May 28, 2024

📌 Commit 98bfd54 has been approved by compiler-errors

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 28, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 28, 2024
…, r=compiler-errors

`-Znext-solver`: eagerly normalize when adding goals

fixes rust-lang#125269. I am not totally with this fix and going to keep this open until we have a more general discussion about how to handle hangs caused by lazy norm in the new solver.
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request May 28, 2024
…, r=compiler-errors

`-Znext-solver`: eagerly normalize when adding goals

fixes rust-lang#125269. I am not totally with this fix and going to keep this open until we have a more general discussion about how to handle hangs caused by lazy norm in the new solver.
bors added a commit to rust-lang-ci/rust that referenced this pull request May 28, 2024
…kingjubilee

Rollup of 4 pull requests

Successful merges:

 - rust-lang#125089 (Improve diagnostic output the `non_local_definitions` lint)
 - rust-lang#125343 (`-Znext-solver`: eagerly normalize when adding goals)
 - rust-lang#125411 (check host's libstdc++ version when using ci llvm)
 - rust-lang#125551 (Stabilise `IpvNAddr::{BITS, to_bits, from_bits}` (`ip_bits`))

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request May 28, 2024
…kingjubilee

Rollup of 5 pull requests

Successful merges:

 - rust-lang#125089 (Improve diagnostic output the `non_local_definitions` lint)
 - rust-lang#125343 (`-Znext-solver`: eagerly normalize when adding goals)
 - rust-lang#125551 (Stabilise `IpvNAddr::{BITS, to_bits, from_bits}` (`ip_bits`))
 - rust-lang#125640 (Don't suggest turning non-char-literal exprs of ty `char` into string literals)
 - rust-lang#125647 (update tracking issue for lazy_cell_consume)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit fb95fda into rust-lang:master May 28, 2024
6 checks passed
@rustbot rustbot added this to the 1.80.0 milestone May 28, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request May 28, 2024
Rollup merge of rust-lang#125343 - lcnr:eagerly-normalize-added-goals, r=compiler-errors

`-Znext-solver`: eagerly normalize when adding goals

fixes rust-lang#125269. I am not totally with this fix and going to keep this open until we have a more general discussion about how to handle hangs caused by lazy norm in the new solver.
@lcnr lcnr deleted the eagerly-normalize-added-goals branch May 28, 2024 14:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

endless loop by running cargo test with toolchain 2024-05-14
5 participants