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

Merge branch 'master' into feature/host-env-prototype

Browse Source
This commit is contained in:
Mark McCaskey
2020-10-27 16:24:00 -07:00
committed by GitHub
parent cfa87b272d 962f3be626
commit 5b67b2f3dc
49 changed files with 3400 additions and 1153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/c-api/src/wasm_c_api/externals/function.rs vendored
View File

@@ -60,7 +60,8 @@ pub unsafe extern "C" fn wasm_func_new(
if !trap.is_null() {
let trap: Box<wasm_trap_t> = Box::from_raw(trap);
RuntimeError::raise(Box::new(trap.inner));
return Err(trap.inner);
}
let processed_results = results
@@ -119,8 +120,13 @@ pub unsafe extern "C" fn wasm_func_new_with_env(
]
.into();
let _traps = callback(env.0, &processed_args, &mut results);
// TODO: do something with `traps`
let trap = callback(env.0, &processed_args, &mut results);
if !trap.is_null() {
let trap: Box<wasm_trap_t> = Box::from_raw(trap);
return Err(trap.inner);
}
let processed_results = results
.into_slice()