match lowering: consistently merge simple or-patterns #123067
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We have to make sure we set it everywhere that we set `subcandidates`.
rustbot
added
S-waiting-on-review
|
r? @oli-obk |
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 26, 2024
…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#122766 (store segment and module in `UnresolvedImportError`) - rust-lang#122996 (simplify_branches: add comment) - rust-lang#123047 (triagebot: Add notification of 2024 issues) - rust-lang#123066 (CFI: (actually) check that methods are object-safe before projecting their receivers to `dyn Trait` in CFI) - rust-lang#123067 (match lowering: consistently merge simple or-patterns) - rust-lang#123069 (Revert `cargo update` changes and bump `download-artifact` to v4) - rust-lang#123070 (Add my former address to .mailmap) - rust-lang#123086 (Fix doc link to BufWriter in std::fs::File documentation) - rust-lang#123090 (Remove `CacheSelector` trait now that we can use GATs) - rust-lang#123091 (Delegation: fix ICE on wrong `self` resolution) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 26, 2024
Rollup merge of rust-lang#123067 - Nadrieril:always-simplify-or, r=oli-obk match lowering: consistently merge simple or-patterns There are two places where we expand or-patterns in match lowering: the main one is `test_candidates_with_or`, and there's one in `match_candidates` that's an optimization for the simple case where the whole pattern is just one or-pattern. To reduce duplication, we merge or-pattern alternatives into a single block when possible, but we only to that in `test_candidates_with_or`. This PR fixes this oversight and merges them in `match_candidates` too. This is a part of splitting up rust-lang#122046 into smaller bits.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 1, 2024
…hewjasper match lowering: handle or-patterns one layer at a time `create_or_subcandidates` and `merge_trivial_subcandidates` both call themselves recursively to handle nested or-patterns, which is hard to follow. In this PR I avoid the need for that; we now process a single "layer" of or-patterns at a time. By calling back into `match_candidates`, we only need to expand one layer at a time. Conversely, since we always try to simplify a layer that we just expanded (thanks to rust-lang#123067), we only have to merge one layer at a time. r? `@matthewjasper`
github-actions bot
pushed a commit
to rust-lang/miri
that referenced
this pull request
Apr 3, 2024
match lowering: handle or-patterns one layer at a time `create_or_subcandidates` and `merge_trivial_subcandidates` both call themselves recursively to handle nested or-patterns, which is hard to follow. In this PR I avoid the need for that; we now process a single "layer" of or-patterns at a time. By calling back into `match_candidates`, we only need to expand one layer at a time. Conversely, since we always try to simplify a layer that we just expanded (thanks to rust-lang/rust#123067), we only have to merge one layer at a time. r? `@matthewjasper`
lnicola
pushed a commit
to lnicola/rust-analyzer
that referenced
this pull request
Apr 7, 2024
match lowering: handle or-patterns one layer at a time `create_or_subcandidates` and `merge_trivial_subcandidates` both call themselves recursively to handle nested or-patterns, which is hard to follow. In this PR I avoid the need for that; we now process a single "layer" of or-patterns at a time. By calling back into `match_candidates`, we only need to expand one layer at a time. Conversely, since we always try to simplify a layer that we just expanded (thanks to rust-lang/rust#123067), we only have to merge one layer at a time. r? `@matthewjasper`
RalfJung
pushed a commit
to RalfJung/rust-analyzer
that referenced
this pull request
Apr 27, 2024
match lowering: handle or-patterns one layer at a time `create_or_subcandidates` and `merge_trivial_subcandidates` both call themselves recursively to handle nested or-patterns, which is hard to follow. In this PR I avoid the need for that; we now process a single "layer" of or-patterns at a time. By calling back into `match_candidates`, we only need to expand one layer at a time. Conversely, since we always try to simplify a layer that we just expanded (thanks to rust-lang/rust#123067), we only have to merge one layer at a time. r? `@matthewjasper`
Shunpoco
added a commit
to Shunpoco/rust
that referenced
this pull request
Dec 30, 2024
From rust-lang#123067, this test should ensure that there is no duplicated instruction block against or-patterns. Signed-off-by: Shunpoco <tkngsnsk313320@gmail.com>
Shunpoco
added a commit
to Shunpoco/rust
that referenced
this pull request
Jan 1, 2025
From rust-lang#123067, this test should ensure that there is no duplicated basic block against or-patterns. Signed-off-by: Shunpoco <tkngsnsk313320@gmail.com>
Shunpoco
added a commit
to Shunpoco/rust
that referenced
this pull request
Jan 4, 2025
From rust-lang#123067, this test should ensure that there is no duplicated basic block against or-patterns. Signed-off-by: Shunpoco <tkngsnsk313320@gmail.com>
jieyouxu
added a commit
to jieyouxu/rust
that referenced
this pull request
Feb 28, 2025
…DianQK Add FileCheck annotations to mir-opt/issues This resolves a part of rust-lang#116971 . The directory `tests/mir-opt/issues` has only one test issue_75439.rs which should add FileCheck annotations. Originally it was introduced in rust-lang#75580 to confirm that there were duplicated basic blocks against or-patterns, but in rust-lang#123067 the duplication was resolved. So FileCheck should ensure that there is no such duplication any more.
jieyouxu
added a commit
to jieyouxu/rust
that referenced
this pull request
Feb 28, 2025
…DianQK Add FileCheck annotations to mir-opt/issues This resolves a part of rust-lang#116971 . The directory `tests/mir-opt/issues` has only one test issue_75439.rs which should add FileCheck annotations. Originally it was introduced in rust-lang#75580 to confirm that there were duplicated basic blocks against or-patterns, but in rust-lang#123067 the duplication was resolved. So FileCheck should ensure that there is no such duplication any more.
jieyouxu
added a commit
to jieyouxu/rust
that referenced
this pull request
Feb 28, 2025
…DianQK Add FileCheck annotations to mir-opt/issues This resolves a part of rust-lang#116971 . The directory `tests/mir-opt/issues` has only one test issue_75439.rs which should add FileCheck annotations. Originally it was introduced in rust-lang#75580 to confirm that there were duplicated basic blocks against or-patterns, but in rust-lang#123067 the duplication was resolved. So FileCheck should ensure that there is no such duplication any more.
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 1, 2025
Rollup merge of rust-lang#134943 - Shunpoco:116971-mir-opt-issues, r=DianQK Add FileCheck annotations to mir-opt/issues This resolves a part of rust-lang#116971 . The directory `tests/mir-opt/issues` has only one test issue_75439.rs which should add FileCheck annotations. Originally it was introduced in rust-lang#75580 to confirm that there were duplicated basic blocks against or-patterns, but in rust-lang#123067 the duplication was resolved. So FileCheck should ensure that there is no such duplication any more.
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There are two places where we expand or-patterns in match lowering: the main one is
test_candidates_with_or, and there's one inmatch_candidatesthat's an optimization for the simple case where the whole pattern is just one or-pattern.To reduce duplication, we merge or-pattern alternatives into a single block when possible, but we only to that in
test_candidates_with_or. This PR fixes this oversight and merges them inmatch_candidatestoo.This is a part of splitting up #122046 into smaller bits.