bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Simplify return block computation

Browse source
This commit is contained in:
Nadrieril 2024-02-16 03:55:00 +01:00
parent a0fa2874e6
commit a11abc6343
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/rustc_mir_build/src/build/matches/mod.rs
View file

@ -1315,7 +1315,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
let mut next_prebinding = start_block; let mut next_prebinding = start_block;
let mut reachable = true; let mut reachable = true;
let mut last_reachable_candidate = None; let mut return_block = None;
for candidate in matched_candidates.iter_mut() { for candidate in matched_candidates.iter_mut() {
assert!(candidate.otherwise_block.is_none()); assert!(candidate.otherwise_block.is_none());
@ -1327,19 +1327,17 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
// pre-binding block for the next candidate. // pre-binding block for the next candidate.
next_prebinding = self.cfg.start_new_block(); next_prebinding = self.cfg.start_new_block();
candidate.otherwise_block = Some(next_prebinding); candidate.otherwise_block = Some(next_prebinding);
return_block = Some(next_prebinding);
} else { } else {
reachable = false; reachable = false;
return_block = Some(self.cfg.start_new_block());
} }
last_reachable_candidate = Some(candidate);
} else { } else {
candidate.pre_binding_block = Some(self.cfg.start_new_block()); candidate.pre_binding_block = Some(self.cfg.start_new_block());
} }
} }
last_reachable_candidate return_block.unwrap()
.unwrap()
.otherwise_block
.unwrap_or_else(|| self.cfg.start_new_block())
} }
/// Tests a candidate where there are only or-patterns left to test, or /// Tests a candidate where there are only or-patterns left to test, or