Skip to content

mir_build: Integrate "simplification" steps into match-pair-tree creation #137875

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

Merged
bors merged 6 commits into from
Mar 5, 2025
Merged

mir_build: Integrate "simplification" steps into match-pair-tree creation #137875

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7a31456
Make `field_match_pairs` push its output nodes to a vector
Zalathar Mar 5, 2025
281455a
Make `MatchPairTree::for_pattern` push its output node to a vector
Zalathar Mar 5, 2025
ef44273
Populate pattern bindings/ascriptions while building `MatchPairTree`
Zalathar Mar 5, 2025
854feae
Remove `TestCase::Irrefutable`
Zalathar Mar 5, 2025
e05df1c
Remove the separate simplify step for match-pair trees
Zalathar Mar 5, 2025
e3e74bc
Make `MatchPairTree::place` non-optional
Zalathar Mar 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Make field_match_pairs push its output nodes to a vector
  • Loading branch information
@Zalathar
Zalathar committed Mar 5, 2025
commit 7a31456c1ce6e9bbf878faf225422bd31ad09e9b
21 changes: 9 additions & 12 deletions compiler/rustc_mir_build/src/builder/matches/match_pair.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,21 @@ use crate::builder::expr::as_place::{PlaceBase, PlaceBuilder};
use crate::builder::matches::{FlatPat, MatchPairTree, TestCase};

impl<'a, 'tcx> Builder<'a, 'tcx> {
/// Builds and returns [`MatchPairTree`] subtrees, one for each pattern in
/// Builds and pushes [`MatchPairTree`] subtrees, one for each pattern in
/// `subpatterns`, representing the fields of a [`PatKind::Variant`] or
/// [`PatKind::Leaf`].
///
/// Used internally by [`MatchPairTree::for_pattern`].
fn field_match_pairs(
&mut self,
match_pairs: &mut Vec<MatchPairTree<'tcx>>,
place: PlaceBuilder<'tcx>,
subpatterns: &[FieldPat<'tcx>],
) -> Vec<MatchPairTree<'tcx>> {
subpatterns
.iter()
.map(|fieldpat| {
let place =
place.clone_project(PlaceElem::Field(fieldpat.field, fieldpat.pattern.ty));
MatchPairTree::for_pattern(place, &fieldpat.pattern, self)
})
.collect()
) {
for fieldpat in subpatterns {
let place = place.clone_project(PlaceElem::Field(fieldpat.field, fieldpat.pattern.ty));
match_pairs.push(MatchPairTree::for_pattern(place, &fieldpat.pattern, self));
}
}

/// Builds [`MatchPairTree`] subtrees for the prefix/middle/suffix parts of an
Expand Down Expand Up @@ -215,7 +212,7 @@ impl<'tcx> MatchPairTree<'tcx> {

PatKind::Variant { adt_def, variant_index, args, ref subpatterns } => {
let downcast_place = place_builder.downcast(adt_def, variant_index); // `(x as Variant)`
subpairs = cx.field_match_pairs(downcast_place, subpatterns);
cx.field_match_pairs(&mut subpairs, downcast_place, subpatterns);

let irrefutable = adt_def.variants().iter_enumerated().all(|(i, v)| {
i == variant_index
Expand All @@ -233,7 +230,7 @@ impl<'tcx> MatchPairTree<'tcx> {
}

PatKind::Leaf { ref subpatterns } => {
subpairs = cx.field_match_pairs(place_builder, subpatterns);
cx.field_match_pairs(&mut subpairs, place_builder, subpatterns);
default_irrefutable()
}

Expand Down