fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-04-25 02:12:13 +00:00
Code Issues Projects Releases Wiki Activity

remove unwind feature

Browse Source
This commit is contained in:
vms 2021-08-05 20:29:12 +03:00
parent 5a83aef904
commit 6424823586
22 changed files with 644 additions and 502 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1100
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

4
Cargo.toml
View File

@ -31,13 +31,13 @@ wabt = { version = "0.9.1", optional = true }
wasmer = { path = "lib/api", default-features = false } wasmer = { path = "lib/api", default-features = false }
wasmer-middleware-common = { path = "lib/middleware-common" } wasmer-middleware-common = { path = "lib/middleware-common" }
wasmer-runtime = { path = "lib/runtime", package = "wasmer-runtime-fl", default-features = false } wasmer-runtime = { path = "lib/runtime", package = "wasmer-runtime-fl", default-features = false }
wasmer-runtime-core = { path = "lib/runtime-core", package = "wasmer-runtime-core-fl" } wasmer-runtime-core = { path = "lib/runtime-core", package = "wasmer-runtime-core-fl", version = "=0.17.1" }
wasmer-kernel-loader = { path = "lib/kernel-loader", optional = true } wasmer-kernel-loader = { path = "lib/kernel-loader", optional = true }
# Backends # Backends
wasmer-singlepass-backend = { path = "lib/singlepass-backend", package = "wasmer-singlepass-backend-fl", optional = true } wasmer-singlepass-backend = { path = "lib/singlepass-backend", package = "wasmer-singlepass-backend-fl", optional = true }
wasmer-clif-backend = { path = "lib/clif-backend", package = "wasmer-clif-backend-fl", optional = true } wasmer-clif-backend = { path = "lib/clif-backend", package = "wasmer-clif-backend-fl", optional = true }
wasmer-llvm-backend = { path = "lib/llvm-backend", package = "wasmer-llvm-backend-fl", optional = true } wasmer-llvm-backend = { path = "lib/llvm-backend", package = "wasmer-llvm-backend-fl", version = "=0.17.1", optional = true }
# Frontends # Frontends
wasmer-emscripten = { path = "lib/emscripten" } wasmer-emscripten = { path = "lib/emscripten" }

2
examples/parallel/Cargo.toml
View File

@ -11,4 +11,4 @@ license = "MIT"
rayon = "1.2" rayon = "1.2"
time = "0.1" time = "0.1"
wasmer-runtime = { path = "../../lib/runtime", package = "wasmer-runtime-fl" } wasmer-runtime = { path = "../../lib/runtime", package = "wasmer-runtime-fl" }
wasmer-runtime-core = { path = "../../lib/runtime-core", package = "wasmer-runtime-core-fl" } wasmer-runtime-core = { path = "../../lib/runtime-core", package = "wasmer-runtime-core-fl", version = "=0.17.1" }

2
fuzz/Cargo.toml
View File

@ -10,7 +10,7 @@ cargo-fuzz = true
[dependencies] [dependencies]
wasmer-runtime-fl = { path = "../lib/runtime" } wasmer-runtime-fl = { path = "../lib/runtime" }
wasmer-runtime-core = { path = "../lib/runtime-core", package = "wasmer-runtime-core-fl" } wasmer-runtime-core = { path = "../lib/runtime-core", package = "wasmer-runtime-core-fl", version = "=0.17.1"}
wasmer = { path = "../" } wasmer = { path = "../" }
wasmer-llvm-backend = { path = "../lib/llvm-backend", package = "wasmer-llvm-backend-fl" } wasmer-llvm-backend = { path = "../lib/llvm-backend", package = "wasmer-llvm-backend-fl" }
wasmer-singlepass-backend = { path = "../lib/singlepass-backend", package = "wasmer-singlepass-backend-fl"} wasmer-singlepass-backend = { path = "../lib/singlepass-backend", package = "wasmer-singlepass-backend-fl"}

2
lib/api/Cargo.toml
View File

@ -12,7 +12,7 @@ license = "MIT"
[dependencies] [dependencies]
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
wasmer-runtime-core = { version = "0.17.0", path = "../runtime-core", package = "wasmer-runtime-core-fl" } wasmer-runtime-core = { version = "=0.17.1", path = "../runtime-core", package = "wasmer-runtime-core-fl" }
[dependencies.wasmer-singlepass-backend] [dependencies.wasmer-singlepass-backend]
path = "../singlepass-backend" path = "../singlepass-backend"

2
lib/clif-backend/Cargo.toml
View File

@ -11,7 +11,7 @@ edition = "2018"
readme = "README.md" readme = "README.md"
[dependencies] [dependencies]
wasmer-runtime-core = { path = "../runtime-core", package = "wasmer-runtime-core-fl", version = "0.17.0" } wasmer-runtime-core = { path = "../runtime-core", package = "wasmer-runtime-core-fl", version = "=0.17.1" }
cranelift-native = "0.59.0" cranelift-native = "0.59.0"
cranelift-codegen = "0.59.0" cranelift-codegen = "0.59.0"
cranelift-entity = "0.59.0" cranelift-entity = "0.59.0"

2
lib/emscripten/Cargo.toml
View File

@ -15,7 +15,7 @@ lazy_static = "1.4"
libc = "0.2.60" libc = "0.2.60"
log = "0.4" log = "0.4"
time = "0.1" time = "0.1"
wasmer-runtime-core = { path = "../runtime-core", package = "wasmer-runtime-core-fl", version = "0.17.0" } wasmer-runtime-core = { path = "../runtime-core", package = "wasmer-runtime-core-fl", version = "=0.17.1" }
[target.'cfg(windows)'.dependencies] [target.'cfg(windows)'.dependencies]
getrandom = "0.1" getrandom = "0.1"

2
lib/kernel-loader/Cargo.toml
View File

@ -7,4 +7,4 @@ edition = "2018"
[dependencies] [dependencies]
libc = "0.2.60" libc = "0.2.60"
wasmer-runtime-core = { path = "../runtime-core", package = "wasmer-runtime-core-fl"} wasmer-runtime-core = { path = "../runtime-core", package = "wasmer-runtime-core-fl", version = "=0.17.1" }

4
lib/llvm-backend/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "wasmer-llvm-backend-fl" name = "wasmer-llvm-backend-fl"
version = "0.17.0" version = "0.17.1"
description = "Wasmer runtime LLVM compiler backend" description = "Wasmer runtime LLVM compiler backend"
license = "MIT" license = "MIT"
authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"] authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
@ -11,7 +11,7 @@ edition = "2018"
readme = "README.md" readme = "README.md"
[dependencies] [dependencies]
wasmer-runtime-core = { path = "../runtime-core", package = "wasmer-runtime-core-fl", version = "0.17.0", features = ["generate-debug-information-no-export-symbols"] } wasmer-runtime-core = { path = "../runtime-core", package = "wasmer-runtime-core-fl", version = "=0.17.1", features = ["generate-debug-information-no-export-symbols"] }
wasmparser = "0.51.3" wasmparser = "0.51.3"
smallvec = "1" smallvec = "1"
goblin = "0.1" goblin = "0.1"

1
lib/llvm-backend/src/backend.rs
View File

@ -53,7 +53,6 @@ extern "C" {
fn throw_trap(ty: i32) -> !; fn throw_trap(ty: i32) -> !;
fn throw_breakpoint(ty: i64) -> !; fn throw_breakpoint(ty: i64) -> !;
#[cfg_attr(nightly, unwind(allowed))]
#[allow(improper_ctypes)] #[allow(improper_ctypes)]
fn throw_runtime_error(data: *mut Option<RuntimeError>) -> !; fn throw_runtime_error(data: *mut Option<RuntimeError>) -> !;

1
lib/llvm-backend/src/lib.rs
View File

@ -10,7 +10,6 @@
all(not(target_os = "windows"), not(target_arch = "aarch64")), all(not(target_os = "windows"), not(target_arch = "aarch64")),
deny(dead_code) deny(dead_code)
)] )]
#![cfg_attr(nightly, feature(unwind_attributes))]
#![doc(html_favicon_url = "https://wasmer.io/static/icons/favicon.ico")] #![doc(html_favicon_url = "https://wasmer.io/static/icons/favicon.ico")]
#![doc(html_logo_url = "https://avatars3.githubusercontent.com/u/44205449?s=200&v=4")] #![doc(html_logo_url = "https://avatars3.githubusercontent.com/u/44205449?s=200&v=4")]

1
lib/llvm-backend/src/platform/unix.rs
View File

@ -47,7 +47,6 @@ pub unsafe fn visit_fde(addr: *mut u8, _size: usize, visitor: extern "C" fn(*mut
} }
extern "C" { extern "C" {
#[cfg_attr(nightly, unwind(allowed))]
fn throw_trap(ty: i32) -> !; fn throw_trap(ty: i32) -> !;
} }

2
lib/middleware-common/Cargo.toml
View File

@ -10,4 +10,4 @@ categories = ["wasm"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
wasmer-runtime-core = { path = "../runtime-core", package = "wasmer-runtime-core-fl", version = "0.17.0" } wasmer-runtime-core = { path = "../runtime-core", package = "wasmer-runtime-core-fl", version = "=0.17.1" }

2
lib/runtime-c-api/Cargo.toml
View File

@ -25,7 +25,7 @@ version = "0.17.0"
[dependencies.wasmer-runtime-core] [dependencies.wasmer-runtime-core]
default-features = false default-features = false
path = "../runtime-core" path = "../runtime-core"
version = "0.17.0" version = "=0.17.1"
package = "wasmer-runtime-core-fl" package = "wasmer-runtime-core-fl"
[dependencies.wasmer-wasi] [dependencies.wasmer-wasi]

2
lib/runtime-core/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "wasmer-runtime-core-fl" name = "wasmer-runtime-core-fl"
version = "0.17.0" version = "0.17.1"
description = "Wasmer runtime core library" description = "Wasmer runtime core library"
license = "MIT" license = "MIT"
authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"] authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]

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

@ -22,7 +22,6 @@
unused_unsafe, unused_unsafe,
unreachable_patterns unreachable_patterns
)] )]
#![cfg_attr(nightly, feature(unwind_attributes))]
#![doc(html_favicon_url = "https://wasmer.io/static/icons/favicon.ico")] #![doc(html_favicon_url = "https://wasmer.io/static/icons/favicon.ico")]
#![doc(html_logo_url = "https://avatars3.githubusercontent.com/u/44205449?s=200&v=4")] #![doc(html_logo_url = "https://avatars3.githubusercontent.com/u/44205449?s=200&v=4")]

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

@ -615,7 +615,6 @@ macro_rules! impl_traits {
// //
// It is also required for the LLVM backend to be // It is also required for the LLVM backend to be
// able to unwind through this function. // able to unwind through this function.
#[cfg_attr(nightly, unwind(allowed))]
extern fn wrap<$( $x, )* Rets, Trap, FN>( extern fn wrap<$( $x, )* Rets, Trap, FN>(
vmctx: &vm::Ctx $( , $x: <$x as WasmExternType>::Native )* vmctx: &vm::Ctx $( , $x: <$x as WasmExternType>::Native )*
) -> Rets::CStruct ) -> Rets::CStruct
@ -732,7 +731,6 @@ macro_rules! impl_traits {
// //
// It is also required for the LLVM backend to be // It is also required for the LLVM backend to be
// able to unwind through this function. // able to unwind through this function.
#[cfg_attr(nightly, unwind(allowed))]
extern fn wrap<$( $x, )* Rets, Trap, FN>( extern fn wrap<$( $x, )* Rets, Trap, FN>(
vmctx: &vm::Ctx $( , $x: <$x as WasmExternType>::Native )* vmctx: &vm::Ctx $( , $x: <$x as WasmExternType>::Native )*
) -> Rets::CStruct ) -> Rets::CStruct

6
lib/runtime/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "wasmer-runtime-fl" name = "wasmer-runtime-fl"
version = "0.17.0" version = "0.17.1"
description = "Wasmer runtime library" description = "Wasmer runtime library"
license = "MIT" license = "MIT"
authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"] authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
@ -17,7 +17,7 @@ memmap = "0.7"
[dependencies.wasmer-runtime-core] [dependencies.wasmer-runtime-core]
path = "../runtime-core" path = "../runtime-core"
version = "0.17.0" version = "=0.17.1"
package = "wasmer-runtime-core-fl" package = "wasmer-runtime-core-fl"
[dependencies.wasmer-clif-backend] [dependencies.wasmer-clif-backend]
@ -41,7 +41,7 @@ wabt = "0.9.1"
[dependencies.wasmer-llvm-backend] [dependencies.wasmer-llvm-backend]
path = "../llvm-backend" path = "../llvm-backend"
version = "0.17.0" version = "=0.17.1"
optional = true optional = true
package = "wasmer-llvm-backend-fl" package = "wasmer-llvm-backend-fl"

2
lib/singlepass-backend/Cargo.toml
View File

@ -11,7 +11,7 @@ edition = "2018"
readme = "README.md" readme = "README.md"
[dependencies] [dependencies]
wasmer-runtime-core = { path = "../runtime-core", package = "wasmer-runtime-core-fl", version = "0.17.0" } wasmer-runtime-core = { path = "../runtime-core", package = "wasmer-runtime-core-fl", version = "=0.17.1" }
dynasm = "0.5" dynasm = "0.5"
dynasmrt = "0.5" dynasmrt = "0.5"
lazy_static = "1.4" lazy_static = "1.4"

2
lib/wasi-experimental-io-devices/Cargo.toml
View File

@ -15,7 +15,7 @@ maintenance = { status = "experimental" }
log = "0.4" log = "0.4"
minifb = "0.13" minifb = "0.13"
wasmer-wasi = { package = "wasmer-wasi-fl", version = "0.17.1", path = "../wasi" } wasmer-wasi = { package = "wasmer-wasi-fl", version = "0.17.1", path = "../wasi" }
wasmer-runtime-core = { version = "0.17.0", package = "wasmer-runtime-core-fl", path = "../runtime-core" } wasmer-runtime-core = { version = "=0.17.1", package = "wasmer-runtime-core-fl", path = "../runtime-core" }
ref_thread_local = "0.0" ref_thread_local = "0.0"
serde = "1" serde = "1"
typetag = "0.1" typetag = "0.1"

2
lib/wasi/Cargo.toml
View File

@ -20,7 +20,7 @@ getrandom = "0.1"
time = "0.1" time = "0.1"
typetag = "0.1" typetag = "0.1"
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
wasmer-runtime-core = { path = "../runtime-core", package = "wasmer-runtime-core-fl", version = "0.17.0" } wasmer-runtime-core = { path = "../runtime-core", package = "wasmer-runtime-core-fl", version = "=0.17.1" }
[target.'cfg(windows)'.dependencies] [target.'cfg(windows)'.dependencies]
winapi = "0.3" winapi = "0.3"

2
lib/win-exception-handler/Cargo.toml
View File

@ -8,7 +8,7 @@ repository = "https://github.com/wasmerio/wasmer"
edition = "2018" edition = "2018"
[target.'cfg(windows)'.dependencies] [target.'cfg(windows)'.dependencies]
wasmer-runtime-core = { path = "../runtime-core", package = "wasmer-runtime-core-fl", version = "0.17.0" } wasmer-runtime-core = { path = "../runtime-core", package = "wasmer-runtime-core-fl", version = "=0.17.1" }
winapi = { version = "0.3.8", features = ["winbase", "errhandlingapi", "minwindef", "minwinbase", "winnt"] } winapi = { version = "0.3.8", features = ["winbase", "errhandlingapi", "minwindef", "minwinbase", "winnt"] }
libc = "0.2.60" libc = "0.2.60"