mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-08-25 01:39:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use abi::args_to_call in indirect calls too.

Browse Source
This commit is contained in:
Nick Lewycky
2020-06-01 13:45:08 -07:00
parent f762690dfb
commit 2812a3330f
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/compiler-llvm/src/translator/code.rs
View File

@ -2200,26 +2200,36 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
let llvm_func_type = func_type_to_llvm(&self.context, &self.intrinsics, func_type);
let pushed_args = self.state.popn_save_extra(func_type.params().len())?;
let params = self.state.popn_save_extra(func_type.params().len())?;
let args: Vec<_> = std::iter::once(ctx_ptr)
.chain(pushed_args.into_iter().enumerate().map(|(i, (v, info))| {
match func_type.params()[i] {
// Apply pending canonicalizations.
let params =
params
.iter()
.zip(func_type.params().iter())
.map(|((v, info), wasm_ty)| match wasm_ty {
Type::F32 => self.builder.build_bitcast(
self.apply_pending_canonicalization(v, info),
self.apply_pending_canonicalization(*v, *info),
self.intrinsics.f32_ty,
"",
),
Type::F64 => self.builder.build_bitcast(
self.apply_pending_canonicalization(v, info),
self.apply_pending_canonicalization(*v, *info),
self.intrinsics.f64_ty,
"",
),
Type::V128 => self.apply_pending_canonicalization(v, info),
_ => v,
}
}))
.collect();
Type::V128 => self.apply_pending_canonicalization(*v, *info),
_ => *v,
});
let params = abi::args_to_call(
// TODO: should be an alloca_builder.
&self.builder,
func_type,
callee_vmctx.into_pointer_value(),
&func.get_type().get_element_type().into_function_type(),
params.collect::<Vec<_>>().as_slice(),
);
let typed_func_ptr = self.builder.build_pointer_cast(
func_ptr,