From 8c524815c36cdc5ab45694196692517c36d25f9f Mon Sep 17 00:00:00 2001
From: Dan Gohman <sunfish@mozilla.com>
Date: Wed, 2 Oct 2019 11:00:28 -0700
Subject: [PATCH] Update dependencies.

---
 lightbeam/Cargo.toml    | 10 ++++++----
 lightbeam/src/module.rs |  8 +++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/lightbeam/Cargo.toml b/lightbeam/Cargo.toml
index 4f6b1b16b2..e92ab9fe0f 100644
--- a/lightbeam/Cargo.toml
+++ b/lightbeam/Cargo.toml
@@ -13,10 +13,10 @@ edition = "2018"
 smallvec = "0.6"
 dynasm = "0.3"
 dynasmrt = "0.3"
-wasmparser = "0.32"
-memoffset = "0.2"
+wasmparser = "0.39.1"
+memoffset = "0.5.1"
 itertools = "0.8"
-capstone = "0.5.0"
+capstone = "0.6.0"
 failure = "0.1.3"
 failure_derive = "0.1.3"
 cranelift-codegen = "0.44"
@@ -24,9 +24,11 @@ multi_mut = "0.1"
 either = "1.5"
 wabt = "0.9.2"
 lazy_static = "1.2"
-quickcheck = "0.7"
 typemap = "0.3"
 
+[dev-dependencies]
+quickcheck = "0.9.0"
+
 [badges]
 maintenance = { status = "experimental" }
 
diff --git a/lightbeam/src/module.rs b/lightbeam/src/module.rs
index 86bead328f..9a61ae9925 100644
--- a/lightbeam/src/module.rs
+++ b/lightbeam/src/module.rs
@@ -217,19 +217,21 @@ impl<T> Drop for BoxSlice<T> {
     }
 }
 
+type BoxByteSlice = BoxSlice<u8>;
+
 pub struct VmCtx {
-    mem: BoxSlice<u8>,
+    mem: BoxByteSlice,
 }
 
 impl VmCtx {
     pub fn offset_of_memory_ptr() -> u32 {
-        offset_of!(VmCtx, mem.ptr)
+        (offset_of!(VmCtx, mem) + offset_of!(BoxByteSlice, ptr))
             .try_into()
             .expect("Offset exceeded size of u32")
     }
 
     pub fn offset_of_memory_len() -> u32 {
-        offset_of!(VmCtx, mem.len)
+        (offset_of!(VmCtx, mem) + offset_of!(BoxByteSlice, len))
             .try_into()
             .expect("Offset exceeded size of u32")
     }