bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Reuse next_prebinding

Browse source 
The moment we get a candidate without guard, the return block becomes a
fresh block linked to nothing. So we can keep assigning a fresh block
every iteration to reuse the `next_prebinding` logic.
This commit is contained in:
Nadrieril 2024-02-16 04:16:19 +01:00
parent a11abc6343
commit 105bdf7086
1 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1315,29 +1315,24 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
let mut next_prebinding = start_block;
let mut reachable = true;
let mut return_block = None;
for candidate in matched_candidates.iter_mut() {
assert!(candidate.otherwise_block.is_none());
assert!(candidate.pre_binding_block.is_none());
candidate.pre_binding_block = Some(next_prebinding);
next_prebinding = self.cfg.start_new_block();
if reachable {
candidate.pre_binding_block = Some(next_prebinding);
if candidate.has_guard {
// Create the otherwise block for this candidate, which is the
// pre-binding block for the next candidate.
next_prebinding = self.cfg.start_new_block();
candidate.otherwise_block = Some(next_prebinding);
return_block = Some(next_prebinding);
} else {
reachable = false;
return_block = Some(self.cfg.start_new_block());
}
} else {
candidate.pre_binding_block = Some(self.cfg.start_new_block());
}
}
return_block.unwrap()
next_prebinding
}
/// Tests a candidate where there are only or-patterns left to test, or