* opening a PR for wasmer: ["calling Ctx data_finalizer upon de…

…struction"](wasmerio/wasmer#561) * updating crates
spacemeshos · Jul 15, 2019 · dccb775 · dccb775
1 parent 68ef2c1
commit dccb775
Show file tree

Hide file tree

Showing 10 changed files with 327 additions and 396 deletions.
diff --git a/crates/svm-core/Cargo.lock b/crates/svm-core/Cargo.lock
diff --git a/crates/svm-core/Cargo.toml b/crates/svm-core/Cargo.toml
@@ -11,13 +11,22 @@ description = "Spacemesh Virtual Machine"
 publish = false
 
 [dependencies]
-wasmer-runtime = { git = "https://github.com/yaronwittenstein/wasmer" }
-wasmer-runtime-core = { git = "https://github.com/yaronwittenstein/wasmer" }
-wasmer-runtime-c-api = { git = "https://github.com/yaronwittenstein/wasmer" }
-wasmer-singlepass-backend = { git = "https://github.com/yaronwittenstein/wasmer" }
+wasmer-singlepass-backend = { git = "https://github.com/yaronwittenstein/wasmer", branch = "ctx-drop-finalizer" }
 wasmparser = "0.31.1"
 svm-storage = { path = "../svm-storage/" }
 
+[dependencies.wasmer-runtime]
+default-features = false
+git = "https://github.com/yaronwittenstein/wasmer"
+branch = "ctx-drop-finalizer"
+features = ["singlepass"]
+
+[dependencies.wasmer-runtime-core]
+default-features = false
+git = "https://github.com/yaronwittenstein/wasmer"
+branch = "ctx-drop-finalizer"
+features = ["backend-singlepass"]
+
 [dev-dependencies]
 wabt = "0.7.4"
 

diff --git a/crates/svm-core/src/lib.rs b/crates/svm-core/src/lib.rs
@@ -8,6 +8,5 @@
 mod compiler;
 
 mod middleware;
-mod vm;
 
 pub use compiler::compile_program;
diff --git a/crates/svm-core/src/middleware/validation.rs b/crates/svm-core/src/middleware/validation.rs
@@ -159,8 +159,6 @@ mod tests {
 
     #[test]
     fn test_parser_floats_are_not_supported() {
-        let compiler = svm_compiler!();
-
         let input = r#"
             (module
                 (func $to_float (param i32) (result f32)

diff --git a/crates/svm-core/src/vm.rs b/crates/svm-core/src/vm.rs