Merge branch 'master' into fix_wasi_read_multi_iov

wasmerio · Jul 27, 2022 · 9c868b3 · 9c868b3
2 parents 00c9186 + 72a7348
commit 9c868b3
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 10 deletions.
diff --git a/lib/api/src/js/function_env.rs b/lib/api/src/js/function_env.rs
@@ -10,7 +10,7 @@ use crate::js::{AsStoreMut, AsStoreRef, StoreMut, StoreRef};
 /// The function environment data is owned by the `Store`.
 pub struct FunctionEnv<T> {
     pub(crate) handle: StoreHandle<VMFunctionEnvironment>,
-    _phantom: PhantomData<T>,
+    marker: PhantomData<T>,
 }
 
 impl<T> FunctionEnv<T> {
@@ -24,14 +24,14 @@ impl<T> FunctionEnv<T> {
                 store.as_store_mut().objects_mut(),
                 VMFunctionEnvironment::new(value),
             ),
-            _phantom: PhantomData,
+            marker: PhantomData,
         }
     }
 
     pub(crate) fn from_handle(handle: StoreHandle<VMFunctionEnvironment>) -> Self {
         Self {
             handle,
-            _phantom: PhantomData,
+            marker: PhantomData,
         }
     }
 
@@ -71,11 +71,26 @@ impl<T> FunctionEnv<T> {
     }
 }
 
+impl<T> PartialEq for FunctionEnv<T> {
+    fn eq(&self, other: &Self) -> bool {
+        self.handle == other.handle
+    }
+}
+
+impl<T> Eq for FunctionEnv<T> {}
+
+impl<T> std::hash::Hash for FunctionEnv<T> {
+    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+        self.handle.hash(state);
+        self.marker.hash(state);
+    }
+}
+
 impl<T> Clone for FunctionEnv<T> {
     fn clone(&self) -> Self {
         Self {
             handle: self.handle.clone(),
-            _phantom: self._phantom,
+            marker: self.marker,
         }
     }
 }

diff --git a/lib/api/src/js/store.rs b/lib/api/src/js/store.rs
@@ -202,7 +202,7 @@ mod objects {
     /// Every handle to an object managed by a context also contains the ID of the
     /// context. This is used to check that a handle is always used with the
     /// correct context.
-    #[derive(Debug, Copy, Clone, Eq, PartialEq)]
+    #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
     pub struct StoreId(NonZeroU64);
 
     impl Default for StoreId {
@@ -298,6 +298,14 @@ mod objects {
             self.id == other.id
         }
     }
+
+    impl<T> std::hash::Hash for StoreHandle<T> {
+        fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+            self.id.hash(state);
+            self.internal.idx.hash(state);
+        }
+    }
+
     impl<T> Clone for StoreHandle<T> {
         fn clone(&self) -> Self {
             Self {

diff --git a/lib/api/src/sys/function_env.rs b/lib/api/src/sys/function_env.rs
@@ -10,11 +10,11 @@ use crate::{AsStoreMut, AsStoreRef, StoreMut, StoreRef};
 /// The function environment data is owned by the `Store`.
 pub struct FunctionEnv<T> {
     pub(crate) handle: StoreHandle<VMFunctionEnvironment>,
-    _phantom: PhantomData<T>,
+    marker: PhantomData<T>,
 }
 
 impl<T> FunctionEnv<T> {
-    /// Make a new extern reference
+    /// Make a new FunctionEnv
     pub fn new(store: &mut impl AsStoreMut, value: T) -> Self
     where
         T: Any + Send + 'static + Sized,
@@ -24,7 +24,7 @@ impl<T> FunctionEnv<T> {
                 store.as_store_mut().objects_mut(),
                 VMFunctionEnvironment::new(value),
             ),
-            _phantom: PhantomData,
+            marker: PhantomData,
         }
     }
 
@@ -64,11 +64,26 @@ impl<T> FunctionEnv<T> {
     }
 }
 
+impl<T> PartialEq for FunctionEnv<T> {
+    fn eq(&self, other: &Self) -> bool {
+        self.handle == other.handle
+    }
+}
+
+impl<T> Eq for FunctionEnv<T> {}
+
+impl<T> std::hash::Hash for FunctionEnv<T> {
+    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+        self.handle.hash(state);
+        self.marker.hash(state);
+    }
+}
+
 impl<T> Clone for FunctionEnv<T> {
     fn clone(&self) -> Self {
         Self {
             handle: self.handle.clone(),
-            _phantom: self._phantom,
+            marker: self.marker,
         }
     }
 }

diff --git a/lib/vm/src/store.rs b/lib/vm/src/store.rs
@@ -16,7 +16,7 @@ use crate::{InstanceHandle, VMFunction, VMFunctionEnvironment, VMGlobal, VMMemor
 /// Every handle to an object managed by a context also contains the ID of the
 /// context. This is used to check that a handle is always used with the
 /// correct context.
-#[derive(Debug, Copy, Clone, Eq, PartialEq)]
+#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
 pub struct StoreId(NonZeroU64);
 
 impl Default for StoreId {
@@ -116,6 +116,13 @@ impl<T> Clone for StoreHandle<T> {
     }
 }
 
+impl<T> std::hash::Hash for StoreHandle<T> {
+    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+        self.id.hash(state);
+        self.internal.idx.hash(state);
+    }
+}
+
 impl<T: StoreObject> fmt::Debug for StoreHandle<T> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("StoreHandle")