bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Merge codegen_call_inner into codegen_terminator_call

Browse source
This commit is contained in:
bjorn3 2020-04-13 17:38:17 +02:00
parent 04af24d418
commit 4bbae74458
1 changed files with 9 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/abi/mod.rs
View file

@ -495,31 +495,6 @@ pub(crate) fn codegen_terminator_call<'tcx>(
.collect::<Vec<_>>() .collect::<Vec<_>>()
}; };
codegen_call_inner(
fx,
span,
Some(func),
fn_ty,
args,
destination.map(|(place, _)| place),
);
if let Some((_, dest)) = destination {
let ret_block = fx.get_block(dest);
fx.bcx.ins().jump(ret_block, &[]);
} else {
trap_unreachable(fx, "[corruption] Diverging function returned");
}
}
fn codegen_call_inner<'tcx>(
fx: &mut FunctionCx<'_, 'tcx, impl Backend>,
span: Span,
func: Option<&Operand<'tcx>>,
fn_ty: Ty<'tcx>,
args: Vec<CValue<'tcx>>,
ret_place: Option<CPlace<'tcx>>,
) {
// FIXME mark the current block as cold when calling a `#[cold]` function. // FIXME mark the current block as cold when calling a `#[cold]` function.
let fn_sig = fx let fn_sig = fx
.tcx .tcx
@ -572,7 +547,7 @@ fn codegen_call_inner<'tcx>(
let nop_inst = fx.bcx.ins().nop(); let nop_inst = fx.bcx.ins().nop();
fx.add_comment(nop_inst, "indirect call"); fx.add_comment(nop_inst, "indirect call");
} }
let func = trans_operand(fx, func.expect("indirect call without func Operand")) let func = trans_operand(fx, func)
.load_scalar(fx); .load_scalar(fx);
( (
Some(func), Some(func),
@ -584,6 +559,7 @@ fn codegen_call_inner<'tcx>(
} }
}; };
let ret_place = destination.map(|(place, _)| place);
let (call_inst, call_args) = let (call_inst, call_args) =
self::returning::codegen_with_call_return_arg(fx, fn_sig, ret_place, |fx, return_ptr| { self::returning::codegen_with_call_return_arg(fx, fn_sig, ret_place, |fx, return_ptr| {
let mut call_args: Vec<Value> = return_ptr let mut call_args: Vec<Value> = return_ptr
@ -641,6 +617,13 @@ fn codegen_call_inner<'tcx>(
.collect::<Vec<AbiParam>>(); .collect::<Vec<AbiParam>>();
fx.bcx.func.dfg.signatures[sig_ref].params = abi_params; fx.bcx.func.dfg.signatures[sig_ref].params = abi_params;
} }
if let Some((_, dest)) = destination {
let ret_block = fx.get_block(dest);
fx.bcx.ins().jump(ret_block, &[]);
} else {
trap_unreachable(fx, "[corruption] Diverging function returned");
}
} }
pub(crate) fn codegen_drop<'tcx>( pub(crate) fn codegen_drop<'tcx>(