fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-06-25 06:31:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into feature/nightly-release

Browse Source
This commit is contained in:
Lachlan Sneff
2019-04-11 14:36:18 -07:00
committed by GitHub
parent 4740b2467f 1e59968bc0
commit 688b6cae26
10 changed files with 88 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/runtime-core/src/lib.rs
View File

@ -1,3 +1,5 @@
#![cfg_attr(nightly, feature(unwind_attributes))]
#[cfg(test)]
#[macro_use]
extern crate field_offset;

5
lib/runtime-core/src/typed_func.rs
View File

@ -339,11 +339,14 @@ macro_rules! impl_traits {
fn to_raw(&self) -> NonNull<vm::Func> {
assert_eq!(mem::size_of::<Self>(), 0, "you cannot use a closure that captures state for `Func`.");
/// This is required for the llvm backend to be able to unwind through this function.
#[cfg_attr(nightly, unwind(allowed))]
extern fn wrap<$( $x: WasmExternType, )* Rets: WasmTypeList, Trap: TrapEarly<Rets>, FN: Fn( &mut Ctx $( ,$x )* ) -> Trap>( ctx: &mut Ctx $( ,$x: $x )* ) -> Rets::CStruct {
let f: FN = unsafe { mem::transmute_copy(&()) };
let err = match panic::catch_unwind(panic::AssertUnwindSafe(|| {
f( ctx $( ,$x )* ).report()
let res = f( ctx $( ,$x )* ).report();
res
})) {
Ok(Ok(returns)) => return returns.into_c_struct(),
Ok(Err(err)) => err,