diff --git a/lib/runtime-core/Cargo.toml b/lib/runtime-core/Cargo.toml index ee1fd19eb..f4f80d985 100644 --- a/lib/runtime-core/Cargo.toml +++ b/lib/runtime-core/Cargo.toml @@ -58,4 +58,4 @@ trace = ["debug"] "backend-singlepass" = [] "backend-llvm" = [] managed = [] -deterministic = ["wasmparser/deterministic"] +deterministic-execution = ["wasmparser/deterministic"] diff --git a/lib/runtime-core/src/codegen.rs b/lib/runtime-core/src/codegen.rs index 7027d6266..8d98bb0c0 100644 --- a/lib/runtime-core/src/codegen.rs +++ b/lib/runtime-core/src/codegen.rs @@ -146,7 +146,7 @@ pub fn validating_parser_config(features: &Features) -> wasmparser::ValidatingPa enable_bulk_memory: false, enable_multi_value: false, - #[cfg(feature = "deterministic")] + #[cfg(feature = "deterministic-execution")] deterministic_only: true, }, } diff --git a/lib/runtime-core/src/lib.rs b/lib/runtime-core/src/lib.rs index d933b555f..accea7641 100644 --- a/lib/runtime-core/src/lib.rs +++ b/lib/runtime-core/src/lib.rs @@ -146,7 +146,7 @@ pub fn validate_and_report_errors_with_features( enable_reference_types: false, enable_threads: features.threads, - #[cfg(feature = "deterministic")] + #[cfg(feature = "deterministic-execution")] deterministic_only: true, }, }; diff --git a/lib/runtime/Cargo.toml b/lib/runtime/Cargo.toml index 838eed3ce..8ed986c50 100644 --- a/lib/runtime/Cargo.toml +++ b/lib/runtime/Cargo.toml @@ -41,7 +41,7 @@ singlepass = ["wasmer-singlepass-backend"] default-backend-singlepass = ["singlepass"] default-backend-llvm = ["llvm"] default-backend-cranelift = ["cranelift"] -deterministic = ["wasmer-singlepass-backend/deterministic", "wasmer-runtime-core/deterministic"] +deterministic-execution = ["wasmer-singlepass-backend/deterministic-execution", "wasmer-runtime-core/deterministic-execution"] [[bench]] name = "nginx" diff --git a/lib/runtime/src/lib.rs b/lib/runtime/src/lib.rs index 3505de649..903dc4783 100644 --- a/lib/runtime/src/lib.rs +++ b/lib/runtime/src/lib.rs @@ -200,14 +200,20 @@ pub fn default_compiler() -> impl Compiler { any( feature = "default-backend-cranelift", feature = "default-backend-singlepass", - feature = "deterministic" + feature = "deterministic-execution" ) ), all( feature = "default-backend-cranelift", - any(feature = "default-backend-singlepass", feature = "deterministic") + any( + feature = "default-backend-singlepass", + feature = "deterministic-execution" + ) ), - all(feature = "default-backend-singlepass", feature = "deterministic") + all( + feature = "default-backend-singlepass", + feature = "deterministic-execution" + ) ))] compile_error!( "The `default-backend-X` features are mutually exclusive. Please choose just one" @@ -216,7 +222,10 @@ pub fn default_compiler() -> impl Compiler { #[cfg(feature = "default-backend-llvm")] use wasmer_llvm_backend::LLVMCompiler as DefaultCompiler; - #[cfg(any(feature = "default-backend-singlepass", feature = "deterministic"))] + #[cfg(any( + feature = "default-backend-singlepass", + feature = "deterministic-execution" + ))] use wasmer_singlepass_backend::SinglePassCompiler as DefaultCompiler; #[cfg(feature = "default-backend-cranelift")] @@ -235,7 +244,7 @@ pub fn compiler_for_backend(backend: Backend) -> Option> { #[cfg(feature = "cranelift")] Backend::Cranelift => Some(Box::new(wasmer_clif_backend::CraneliftCompiler::new())), - #[cfg(feature = "singlepass")] + #[cfg(any(feature = "singlepass", feature = "deterministic-execution"))] Backend::Singlepass => Some(Box::new( wasmer_singlepass_backend::SinglePassCompiler::new(), )), @@ -246,7 +255,8 @@ pub fn compiler_for_backend(backend: Backend) -> Option> { #[cfg(any( not(feature = "llvm"), not(feature = "singlepass"), - not(feature = "cranelift") + not(feature = "cranelift"), + not(feature = "deterministic-execution"), ))] _ => None, } diff --git a/lib/singlepass-backend/Cargo.toml b/lib/singlepass-backend/Cargo.toml index d6dc63c7a..e3a40548e 100644 --- a/lib/singlepass-backend/Cargo.toml +++ b/lib/singlepass-backend/Cargo.toml @@ -21,4 +21,4 @@ smallvec = "0.6" [features] default = [] -deterministic = ["wasmparser/deterministic", "wasmer-runtime-core/deterministic"] +deterministic-execution = ["wasmparser/deterministic", "wasmer-runtime-core/deterministic-execution"]