externref: Address review feedback

bytecodealliance · Jun 15, 2020 · 43063cb · 43063cb
1 parent 618c278
commit 43063cb
Show file tree

Hide file tree

Showing 18 changed files with 389 additions and 547 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -87,6 +87,3 @@ maintenance = { status = "actively-developed" }
 [[test]]
 name = "host_segfault"
 harness = false
-
-[patch.crates-io]
-backtrace = { git = "https://github.com/rust-lang/backtrace-rs.git" }
diff --git a/crates/environ/src/cranelift.rs b/crates/environ/src/cranelift.rs
@@ -221,7 +221,7 @@ impl binemit::StackmapSink for StackMapSink {
 
 impl StackMapSink {
     fn finish(mut self) -> Vec<StackMapInformation> {
-        self.infos.sort_by_key(|info| info.code_offset);
+        self.infos.sort_unstable_by_key(|info| info.code_offset);
         self.infos
     }
 }

diff --git a/crates/jit/src/code_memory.rs b/crates/jit/src/code_memory.rs
@@ -134,7 +134,7 @@ impl CodeMemory {
 
             if !m.is_empty() {
                 unsafe {
-                    region::protect(m.as_mut_ptr(), m.len(), region::Protection::ReadExecute)
+                    region::protect(m.as_mut_ptr(), m.len(), region::Protection::READ_EXECUTE)
                 }
                 .expect("unable to make memory readonly and executable");
             }

diff --git a/crates/jit/src/instantiate.rs b/crates/jit/src/instantiate.rs
@@ -206,8 +206,8 @@ impl CompiledModule {
             signatures.into_boxed_slice(),
             host_state,
             interrupts,
-            externref_activations_table,
-            stack_map_registry,
+            &*externref_activations_table as *const _ as *mut _,
+            &*stack_map_registry as *const _ as *mut _,
         )
     }
 

diff --git a/crates/runtime/Cargo.toml b/crates/runtime/Cargo.toml
@@ -21,7 +21,7 @@ indexmap = "1.0.2"
 thiserror = "1.0.4"
 more-asserts = "0.2.1"
 cfg-if = "0.1.9"
-backtrace = "0.3.42"
+backtrace = "0.3.49"
 lazy_static = "1.3.0"
 
 [target.'cfg(target_os = "windows")'.dependencies]