dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Only codegen a trap for functions with uninhabited arguments 

Fixes #847
This commit is contained in:
bjorn3 2019-12-28 11:10:21 +01:00
parent 8bf5cd345e
commit 958c58545f
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/base.rs
View File

@ -54,8 +54,15 @@ pub fn trans_fn<'clif, 'tcx, B: Backend + 'static>(
source_info_set: indexmap::IndexSet::new(),
};
crate::abi::codegen_fn_prelude(&mut fx, start_ebb);
codegen_fn_content(&mut fx);
if fx.mir.args_iter().any(|arg| fx.layout_of(fx.monomorphize(&fx.mir.local_decls[arg].ty)).abi.is_uninhabited()) {
let entry_block = fx.bcx.create_ebb();
fx.bcx.append_ebb_params_for_function_params(entry_block);
fx.bcx.switch_to_block(entry_block);
crate::trap::trap_unreachable(&mut fx, "function has uninhabited argument");
} else {
crate::abi::codegen_fn_prelude(&mut fx, start_ebb);
codegen_fn_content(&mut fx);
}
// Recover all necessary data from fx, before accessing func will prevent future access to it.
let instance = fx.instance;