bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rustc_mir_build: drive-by-cleaup: replace nested ifs with a match

Browse source
This commit is contained in:
Maybe Waffle 2022-11-21 14:22:44 +00:00
parent 5ae51d69a3
commit 03d5f9b783
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
compiler/rustc_mir_build/src/build/scope.rs
View file

@ -644,24 +644,27 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
} }
}; };
if let Some(destination) = destination { match (destination, value) {
if let Some(value) = value { (Some(destination), Some(value)) => {
debug!("stmt_expr Break val block_context.push(SubExpr)"); debug!("stmt_expr Break val block_context.push(SubExpr)");
self.block_context.push(BlockFrame::SubExpr); self.block_context.push(BlockFrame::SubExpr);
unpack!(block = self.expr_into_dest(destination, block, value)); unpack!(block = self.expr_into_dest(destination, block, value));
self.block_context.pop(); self.block_context.pop();
} else { }
(Some(destination), None) => {
self.cfg.push_assign_unit(block, source_info, destination, self.tcx) self.cfg.push_assign_unit(block, source_info, destination, self.tcx)
} }
} else { (None, Some(_)) => {
assert!(value.is_none(), "`return` and `break` should have a destination"); panic!("`return`, `become` and `break` with value and must have a destination")
if self.tcx.sess.instrument_coverage() { }
(None, None) if self.tcx.sess.instrument_coverage() => {
// Unlike `break` and `return`, which push an `Assign` statement to MIR, from which // Unlike `break` and `return`, which push an `Assign` statement to MIR, from which
// a Coverage code region can be generated, `continue` needs no `Assign`; but // a Coverage code region can be generated, `continue` needs no `Assign`; but
// without one, the `InstrumentCoverage` MIR pass cannot generate a code region for // without one, the `InstrumentCoverage` MIR pass cannot generate a code region for
// `continue`. Coverage will be missing unless we add a dummy `Assign` to MIR. // `continue`. Coverage will be missing unless we add a dummy `Assign` to MIR.
self.add_dummy_assignment(span, block, source_info); self.add_dummy_assignment(span, block, source_info);
} }
(None, None) => {}
} }
let region_scope = self.scopes.breakable_scopes[break_index].region_scope; let region_scope = self.scopes.breakable_scopes[break_index].region_scope;