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

Check def id before calling match_projection_projections #123471

Merged

Conversation

compiler-errors
Copy link
Member

When I "inlined" assemble_candidates_from_predicates into for_each_item_bound in #120584, I forgot to copy over the check that actually made sure the def id of the candidate was equal to the def id of the obligation. This means that we normalize goal a bit too often even if it's not productive to do so.

This PR adds that def id check back.
Fixes #123448

@rustbot
Copy link
Collaborator

rustbot commented Apr 4, 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 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 Apr 4, 2024
@compiler-errors compiler-errors added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Apr 4, 2024
@oli-obk
Copy link
Contributor

oli-obk commented Apr 4, 2024

@bors r+

@bors
Copy link
Contributor

bors commented Apr 4, 2024

📌 Commit 43dae69 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 Apr 4, 2024
@compiler-errors
Copy link
Member Author

@bors rollup=never

@bors
Copy link
Contributor

bors commented Apr 6, 2024

⌛ Testing commit 43dae69 with merge 8d490e3...

@bors
Copy link
Contributor

bors commented Apr 6, 2024

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing 8d490e3 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 6, 2024
@bors bors merged commit 8d490e3 into rust-lang:master Apr 6, 2024
12 checks passed
@rustbot rustbot added this to the 1.79.0 milestone Apr 6, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (8d490e3): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 668.691s -> 667.537s (-0.17%)
Artifact size: 318.20 MiB -> 318.23 MiB (0.01%)

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

Add a debug asserts call to match_projection_projections to ensure invariant

Small nit as follow up of rust-lang#123471.

r? `@compiler-errors`

`@bors` rollup=always
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 7, 2024
Rollup merge of rust-lang#123559 - spastorino:match_projection_projections_invariant, r=compiler-errors

Add a debug asserts call to match_projection_projections to ensure invariant

Small nit as follow up of rust-lang#123471.

r? `@compiler-errors`

`@bors` rollup=always
@apiraino
Copy link
Contributor

Beta backport accepted as per compiler team on Zulip. A backport PR will be authored by the release team at the end of the current development cycle.

@rustbot label +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Apr 11, 2024
@cuviper cuviper mentioned this pull request Apr 11, 2024
@cuviper cuviper modified the milestones: 1.79.0, 1.78.0 Apr 11, 2024
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Apr 11, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 12, 2024
[beta] backports

- fix attribute validation on associated items in traits rust-lang#121545
- Only inspect user-written predicates for privacy concerns rust-lang#123377
- Check def id before calling `match_projection_projections` rust-lang#123471
- Restore `pred_known_to_hold_modulo_regions` rust-lang#123578
- Beta revert "Use OS thread name by default" rust-lang#123533

r? cuviper
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 12, 2024
[beta] backports

- fix attribute validation on associated items in traits rust-lang#121545
- Only inspect user-written predicates for privacy concerns rust-lang#123377
- Check def id before calling `match_projection_projections` rust-lang#123471
- Restore `pred_known_to_hold_modulo_regions` rust-lang#123578
- Beta revert "Use OS thread name by default" rust-lang#123533

r? cuviper
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. merged-by-bors This PR was explicitly merged by bors. 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.

circular set of associated types cause cargo build to hang
8 participants