mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-11 07:08:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use blocktype_params_results in lieu of blocktype_to_types.

Browse Source 
Remove read_info.rs entirely.

Add `to_compile_error` that converts a WasmResult into a Result<_, CompileError>, use it with `wptype_to_type`. This is a candidate for being moved into shared code.

Many functions had to change to deal with propagating CompileError.
This commit is contained in:
Nick Lewycky
2020-06-02 15:19:50 -07:00
parent 04f2db1b82
commit 7bdd387474
7 changed files with 202 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/compiler-llvm/src/trampoline/wasm.rs
View File

@@ -45,7 +45,7 @@ impl FuncTrampoline {
module.set_data_layout(&target_machine.get_target_data().get_data_layout());
let intrinsics = Intrinsics::declare(&module, &self.ctx);
let (callee_ty, callee_attrs) = func_type_to_llvm(&self.ctx, &intrinsics, ty);
let (callee_ty, callee_attrs) = func_type_to_llvm(&self.ctx, &intrinsics, ty)?;
let trampoline_ty = intrinsics.void_ty.fn_type(
&[
intrinsics.ctx_ptr_ty.as_basic_type_enum(), // callee_vmctx ptr
@@ -134,13 +134,13 @@ impl FuncTrampoline {
module.set_data_layout(&target_machine.get_target_data().get_data_layout());
let intrinsics = Intrinsics::declare(&module, &self.ctx);
let params = iter::once(intrinsics.ctx_ptr_ty.as_basic_type_enum())
let params = iter::once(Ok(intrinsics.ctx_ptr_ty.as_basic_type_enum()))
.chain(
ty.params()
.iter()
.map(|param_ty| type_to_llvm(&intrinsics, *param_ty)),
)
.collect::<Vec<_>>();
.collect::<Result<Vec<_>, _>>()?;
let trampoline_ty = intrinsics.void_ty.fn_type(params.as_slice(), false);
let trampoline_func = module.add_function("", trampoline_ty, Some(Linkage::External));
@@ -270,7 +270,7 @@ fn generate_trampoline<'ctx>(
.results()
.iter()
.map(|&ty| type_to_llvm(intrinsics, ty))
.collect();
.collect::<Result<_, _>>()?;
let sret_ty = context.struct_type(&basic_types, false);
args_vec.push(builder.build_alloca(sret_ty, "sret").into());