Merge branch 'master' of github.com:wasmerio/wasmer into simd

lib/runtime-core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wasmer-runtime-core"
-version = "0.5.4"
+version = "0.5.6"
 description = "Wasmer runtime core library"
 license = "MIT"
 authors = ["The Wasmer Engineering Team <engineering@wasmer.io>"]
@@ -8,7 +8,7 @@ repository = "https://github.com/wasmerio/wasmer"
 edition = "2018"
 
 [dependencies]
-nix = "0.12.0"
+nix = "0.14.0"
 page_size = "0.4.1"
 wasmparser = "0.32.1"
 parking_lot = "0.7.1"
@@ -55,5 +55,5 @@ cc = "1.0"
 debug = []
 trace = ["debug"]
 # backend flags used in conditional compilation of Backend::variants
-"backend:singlepass" = []
-"backend:llvm" = []
+"backend-singlepass" = []
+"backend-llvm" = []

lib/runtime-core/src/backend.rs

@@ -33,9 +33,9 @@ impl Backend {
     pub fn variants() -> &'static [&'static str] {
         &[
             "cranelift",
-            #[cfg(feature = "backend:singlepass")]
+            #[cfg(feature = "backend-singlepass")]
             "singlepass",
-            #[cfg(feature = "backend:llvm")]
+            #[cfg(feature = "backend-llvm")]
             "llvm",
         ]
     }
@@ -117,6 +117,7 @@ pub struct CompilerConfig {
     pub symbol_map: Option<HashMap<u32, String>>,
     pub memory_bound_check_mode: MemoryBoundCheckMode,
     pub enforce_stack_check: bool,
+    pub track_state: bool,
 }
 
 pub trait Compiler {

lib/runtime-core/src/state.rs

@@ -111,7 +111,13 @@ impl ModuleStateMap {
                 .unwrap();
 
             match fsm.call_offsets.get(&(ip - base)) {
-                Some(x) => Some((fsm, fsm.diffs[x.diff_id].build_state(fsm))),
+                Some(x) => {
+                    if x.diff_id < fsm.diffs.len() {
+                        Some((fsm, fsm.diffs[x.diff_id].build_state(fsm)))
+                    } else {
+                        None
+                    }
+                }
                 None => None,
             }
         }
@@ -132,7 +138,13 @@ impl ModuleStateMap {
                 .unwrap();
 
             match fsm.trappable_offsets.get(&(ip - base)) {
-                Some(x) => Some((fsm, fsm.diffs[x.diff_id].build_state(fsm))),
+                Some(x) => {
+                    if x.diff_id < fsm.diffs.len() {
+                        Some((fsm, fsm.diffs[x.diff_id].build_state(fsm)))
+                    } else {
+                        None
+                    }
+                }
                 None => None,
             }
         }
@@ -149,7 +161,13 @@ impl ModuleStateMap {
                 .unwrap();
 
             match fsm.loop_offsets.get(&(ip - base)) {
-                Some(x) => Some((fsm, fsm.diffs[x.diff_id].build_state(fsm))),
+                Some(x) => {
+                    if x.diff_id < fsm.diffs.len() {
+                        Some((fsm, fsm.diffs[x.diff_id].build_state(fsm)))
+                    } else {
+                        None
+                    }
+                }
                 None => None,
             }
         }

lib/runtime-core/src/vm.rs

@@ -74,7 +74,7 @@ pub struct InternalCtx {
     /// A pointer to an array of locally-defined globals, indexed by `GlobalIndex`.
     pub globals: *mut *mut LocalGlobal,
 
-    /// A pointer to an array of imported memories, indexed by `MemoryIndex,
+    /// A pointer to an array of imported memories, indexed by `MemoryIndex`,
     pub imported_memories: *mut *mut LocalMemory,
 
     /// A pointer to an array of imported tables, indexed by `TableIndex`.