Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(c-api) Correctly implement “trap” in wasm_func_new* #1751

Merged
merged 2 commits into from
Oct 26, 2020
Merged

feat(c-api) Correctly implement “trap” in wasm_func_new* #1751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d80bef
feat(c-api) Correctly implement “trap” in `wasm_func_new*`.
Hywan Oct 22, 2020
184e3f4
doc(changelog) Add #1751.
Hywan Oct 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
- [#1710](https://github.com/wasmerio/wasmer/pull/1710) Memory for function call trampolines is now owned by the Artifact.
### Added

- [#1751](https://github.com/wasmerio/wasmer/pull/1751) Implement `wasm_trap_t` inside a function declared with `wasm_func_new_with_env` in the Wasm C API.
- [#1741](https://github.com/wasmerio/wasmer/pull/1741) Implement `wasm_memory_type` in the Wasm C API.
- [#1736](https://github.com/wasmerio/wasmer/pull/1736) Implement `wasm_global_type` in the Wasm C API.
- [#1699](https://github.com/wasmerio/wasmer/pull/1699) Update `wasm.h` to its latest version.
Expand Down
12 changes: 9 additions & 3 deletions lib/c-api/src/wasm_c_api/externals/function.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -110,8 +111,13 @@ pub unsafe extern "C" fn wasm_func_new_with_env(
]
.into();

let _traps = callback(*env, &processed_args, &mut results);
// TODO: do something with `traps`
let trap = callback(*env, &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()
Expand Down