bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #78039 - tmiasko:unreachable-block, r=Mark-Simulacrum

Browse source 
Remove unused cached_unreachable_block from MIR builder
This commit is contained in:
bors 2020-10-17 12:36:32 +00:00
commit dda2b5e3e2
1 changed files with 0 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
compiler/rustc_mir_build/src/build/mod.rs
View file

@ -351,9 +351,6 @@ struct Builder<'a, 'tcx> {
unit_temp: Option<Place<'tcx>>, unit_temp: Option<Place<'tcx>>,
var_debug_info: Vec<VarDebugInfo<'tcx>>, var_debug_info: Vec<VarDebugInfo<'tcx>>,
/// Cached block with the `UNREACHABLE` terminator.
cached_unreachable_block: Option<BasicBlock>,
} }
impl<'a, 'tcx> Builder<'a, 'tcx> { impl<'a, 'tcx> Builder<'a, 'tcx> {
@ -634,10 +631,6 @@ where
builder.cfg.terminate(return_block, source_info, TerminatorKind::Return); builder.cfg.terminate(return_block, source_info, TerminatorKind::Return);
let should_abort = should_abort_on_panic(tcx, fn_def_id, abi); let should_abort = should_abort_on_panic(tcx, fn_def_id, abi);
builder.build_drop_trees(should_abort); builder.build_drop_trees(should_abort);
// Attribute any unreachable codepaths to the function's closing brace
if let Some(unreachable_block) = builder.cached_unreachable_block {
builder.cfg.terminate(unreachable_block, source_info, TerminatorKind::Unreachable);
}
return_block.unit() return_block.unit()
})); }));
@ -676,12 +669,6 @@ fn construct_const<'a, 'tcx>(
builder.build_drop_trees(false); builder.build_drop_trees(false);
// Constants may be match expressions in which case an unreachable block may
// be created, so terminate it properly.
if let Some(unreachable_block) = builder.cached_unreachable_block {
builder.cfg.terminate(unreachable_block, source_info, TerminatorKind::Unreachable);
}
builder.finish() builder.finish()
} }
@ -757,7 +744,6 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
var_indices: Default::default(), var_indices: Default::default(),
unit_temp: None, unit_temp: None,
var_debug_info: vec![], var_debug_info: vec![],
cached_unreachable_block: None,
}; };
assert_eq!(builder.cfg.start_new_block(), START_BLOCK); assert_eq!(builder.cfg.start_new_block(), START_BLOCK);