mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Inline finalize_or_candidate

Browse Source
This commit is contained in:
Zalathar 2024-07-18 22:51:17 +10:00
parent 886668cc2e
commit 239037ecde
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
compiler/rustc_mir_build/src/build/matches/mod.rs
View File

@ -1624,7 +1624,8 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
}); });
for candidate in candidates_to_expand.iter_mut() { for candidate in candidates_to_expand.iter_mut() {
if !candidate.subcandidates.is_empty() { if !candidate.subcandidates.is_empty() {
self.finalize_or_candidate(candidate); self.merge_trivial_subcandidates(candidate);
self.remove_never_subcandidates(candidate);
} }
} }
if let Some(last_candidate) = candidates_to_expand.last_mut() { if let Some(last_candidate) = candidates_to_expand.last_mut() {
@ -1635,8 +1636,8 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
} }
/// Given a match-pair that corresponds to an or-pattern, expand each subpattern into a new /// Given a match-pair that corresponds to an or-pattern, expand each subpattern into a new
/// subcandidate. Any candidate that has been expanded that way should be passed to /// subcandidate. Any candidate that has been expanded this way should also be postprocessed
/// `finalize_or_candidate` after its subcandidates have been processed. /// at the end of [`Self::expand_and_match_or_candidates`].
fn create_or_subcandidates<'pat>( fn create_or_subcandidates<'pat>(
&mut self, &mut self,
candidate: &mut Candidate<'pat, 'tcx>, candidate: &mut Candidate<'pat, 'tcx>,
@ -1653,8 +1654,9 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
candidate.subcandidates[0].false_edge_start_block = candidate.false_edge_start_block; candidate.subcandidates[0].false_edge_start_block = candidate.false_edge_start_block;
} }
/// Simplify subcandidates and remove `is_never` subcandidates. /// Try to merge all of the subcandidates of the given candidate into one. This avoids
/// The candidate should have been expanded with `create_or_subcandidates`. /// exponentially large CFGs in cases like `(1 | 2, 3 | 4, ...)`. The candidate should have been
/// expanded with `create_or_subcandidates`.
/// ///
/// Given a pattern `(P | Q, R | S)` we (in principle) generate a CFG like /// Given a pattern `(P | Q, R | S)` we (in principle) generate a CFG like
/// so: /// so:
@ -1706,18 +1708,6 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
/// | /// |
/// ... /// ...
/// ``` /// ```
fn finalize_or_candidate(&mut self, candidate: &mut Candidate<'_, 'tcx>) {
if candidate.subcandidates.is_empty() {
return;
}
self.merge_trivial_subcandidates(candidate);
self.remove_never_subcandidates(candidate);
}
/// Try to merge all of the subcandidates of the given candidate into one. This avoids
/// exponentially large CFGs in cases like `(1 | 2, 3 | 4, ...)`. The candidate should have been
/// expanded with `create_or_subcandidates`.
/// ///
/// Note that this takes place _after_ the subcandidates have participated /// Note that this takes place _after_ the subcandidates have participated
/// in match tree lowering. /// in match tree lowering.