bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Make MatchPairTree::place non-optional

Browse source 
As the invariant indicated, this place could only be none for
`TestCase::Irrefutable` nodes, which no longer exist.
This commit is contained in:
Zalathar 2025-03-05 23:26:00 +11:00
parent e05df1cb5d
commit e3e74bc89a
4 changed files with 9 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/rustc_mir_build/src/builder/matches/match_pair.rs
View file

@ -115,6 +115,7 @@ impl<'tcx> MatchPairTree<'tcx> {
place_builder = place_builder.project(ProjectionElem::OpaqueCast(pattern.ty));
}
// Place can be none if the pattern refers to a non-captured place in a closure.
let place = place_builder.try_to_place(cx);
let mut subpairs = Vec::new();
let test_case = match pattern.kind {
@ -320,7 +321,7 @@ impl<'tcx> MatchPairTree<'tcx> {
if let Some(test_case) = test_case {
// This pattern is refutable, so push a new match-pair node.
match_pairs.push(MatchPairTree {
place,
place: place.expect("refutable patterns should always have a place to inspect"),
test_case,
subpairs,
pattern_ty: pattern.ty,

12
compiler/rustc_mir_build/src/builder/matches/mod.rs
View file

@ -1256,13 +1256,7 @@ impl<'tcx> TestCase<'tcx> {
#[derive(Debug, Clone)]
pub(crate) struct MatchPairTree<'tcx> {
/// This place...
///
/// ---
/// This can be `None` if it referred to a non-captured place in a closure.
///
/// Invariant: Can only be `None` when `test_case` is `Irrefutable`.
/// Therefore this must be `Some(_)` after simplification.
place: Option<Place<'tcx>>,
place: Place<'tcx>,
/// ... must pass this test...
test_case: TestCase<'tcx>,
@ -2082,11 +2076,9 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
// Extract the match-pair from the highest priority candidate
let match_pair = &candidates[0].match_pairs[0];
let test = self.pick_test_for_match_pair(match_pair);
// Unwrap is ok after simplification.
let match_place = match_pair.place.unwrap();
debug!(?test, ?match_pair);
(match_place, test)
(match_pair.place, test)
}
/// Given a test, we partition the input candidates into several buckets.

9
compiler/rustc_mir_build/src/builder/matches/test.rs
View file

@ -540,11 +540,8 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
// than one, but it'd be very unusual to have two sides that
// both require tests; you'd expect one side to be simplified
// away.)
let (match_pair_index, match_pair) = candidate
.match_pairs
.iter()
.enumerate()
.find(|&(_, mp)| mp.place == Some(test_place))?;
let (match_pair_index, match_pair) =
candidate.match_pairs.iter().enumerate().find(|&(_, mp)| mp.place == test_place)?;
// If true, the match pair is completely entailed by its corresponding test
// branch, so it can be removed. If false, the match pair is _compatible_
@ -587,7 +584,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
candidate
.match_pairs
.iter()
.any(|mp| mp.place == Some(test_place) && is_covering_range(&mp.test_case))
.any(|mp| mp.place == test_place && is_covering_range(&mp.test_case))
};
if sorted_candidates
.get(&TestBranch::Failure)

8
compiler/rustc_mir_build/src/builder/matches/util.rs
View file

@ -173,14 +173,10 @@ impl<'a, 'b, 'tcx> FakeBorrowCollector<'a, 'b, 'tcx> {
// }
// ```
// Hence we fake borrow using a deep borrow.
if let Some(place) = match_pair.place {
self.fake_borrow(place, FakeBorrowKind::Deep);
}
self.fake_borrow(match_pair.place, FakeBorrowKind::Deep);
} else {
// Insert a Shallow borrow of any place that is switched on.
if let Some(place) = match_pair.place {
self.fake_borrow(place, FakeBorrowKind::Shallow);
}
self.fake_borrow(match_pair.place, FakeBorrowKind::Shallow);
for subpair in &match_pair.subpairs {
self.visit_match_pair(subpair);