A lightweight WebAssembly runtime that is fast, secure, and standards-compliant
Rename our OOM-handling `EntitySet` to `TryEntitySet` (#12722)
Nick Fitzgerald1c1843dadd63
diff --git a/crates/environ/src/collections.rs b/crates/environ/src/collections.rsindex 2938447500..c84583906a 100644--- a/crates/environ/src/collections.rs+++ b/crates/environ/src/collections.rs@@ -9,7 +9,7 @@ mod primary_map;mod secondary_map;pub use btree_map::BTreeMap;-pub use entity_set::EntitySet;+pub use entity_set::TryEntitySet;pub use hash_map::HashMap;pub use hash_set::HashSet;pub use index_map::IndexMap;diff --git a/crates/environ/src/collections/entity_set.rs b/crates/environ/src/collections/entity_set.rsindex d4bc95647c..af4a2d03ef 100644--- a/crates/environ/src/collections/entity_set.rs+++ b/crates/environ/src/collections/entity_set.rs@@ -4,20 +4,20 @@ use wasmtime_core::error::OutOfMemory;/// Like `cranelift_entity::EntitySet` but enforces fallible allocation for all/// methods that allocate.#[derive(Debug, Default)]-pub struct EntitySet<K>+pub struct TryEntitySet<K>whereK: EntityRef,{inner: cranelift_entity::EntitySet<K>,}-impl<K> EntitySet<K>+impl<K> TryEntitySet<K>whereK: EntityRef,{/// Create a new empty set.pub fn new() -> Self {- EntitySet {+ TryEntitySet {inner: Default::default(),}}diff --git a/crates/environ/src/prelude.rs b/crates/environ/src/prelude.rsindex 0990bae213..059e9dc55e 100644--- a/crates/environ/src/prelude.rs+++ b/crates/environ/src/prelude.rs@@ -20,7 +20,7 @@//! and then `use crate::*` works as usual.pub use crate::collections::{- EntitySet, TryClone, TryCollect, TryExtend, TryFromIterator, TryNew, TryString, TryToOwned,+ TryClone, TryCollect, TryEntitySet, TryExtend, TryFromIterator, TryNew, TryString, TryToOwned,TryVec, try_new, try_vec,};pub use crate::error::{Context, Error, Result, bail, ensure, format_err};diff --git a/crates/fuzzing/tests/oom.rs b/crates/fuzzing/tests/oom.rsindex 1e17e669b2..2793c58b6c 100644--- a/crates/fuzzing/tests/oom.rs+++ b/crates/fuzzing/tests/oom.rs@@ -195,18 +195,18 @@ fn secondary_map_try_insert() -> Result<()> {}#[test]-fn entity_set_ensure_capacity() -> Result<()> {+fn try_entity_set_ensure_capacity() -> Result<()> {OomTest::new().test(|| {- let mut set = EntitySet::<Key>::new();+ let mut set = TryEntitySet::<Key>::new();set.ensure_capacity(100)?;Ok(())})}#[test]-fn entity_set_insert() -> Result<()> {+fn try_entity_set_insert() -> Result<()> {OomTest::new().test(|| {- let mut set = EntitySet::<Key>::new();+ let mut set = TryEntitySet::<Key>::new();set.insert(Key::from_u32(256))?;Ok(())})diff --git a/crates/wasmtime/src/runtime/vm/instance.rs b/crates/wasmtime/src/runtime/vm/instance.rsindex b8ce61912a..26748c37e3 100644--- a/crates/wasmtime/src/runtime/vm/instance.rs+++ b/crates/wasmtime/src/runtime/vm/instance.rs@@ -130,11 +130,11 @@ pub struct Instance {/// Stores the dropped passive element segments in this instantiation by index./// If the index is present in the set, the segment has been dropped.- dropped_elements: EntitySet<ElemIndex>,+ dropped_elements: TryEntitySet<ElemIndex>,/// Stores the dropped passive data segments in this instantiation by index./// If the index is present in the set, the segment has been dropped.- dropped_data: EntitySet<DataIndex>,+ dropped_data: TryEntitySet<DataIndex>,// TODO: add support for multiple memories; `wmemcheck_state` corresponds to// memory 0.@@ -171,8 +171,8 @@ impl Instance {) -> Result<InstanceHandle, OutOfMemory> {let module = req.runtime_info.env_module();let memory_tys = &module.memories;- let dropped_elements = EntitySet::with_capacity(module.passive_elements.len())?;- let dropped_data = EntitySet::with_capacity(module.passive_data_map.len())?;+ let dropped_elements = TryEntitySet::with_capacity(module.passive_elements.len())?;+ let dropped_data = TryEntitySet::with_capacity(module.passive_data_map.len())?;#[cfg(feature = "wmemcheck")]let wmemcheck_state = if req.store.engine().config().wmemcheck {@@ -1626,12 +1626,12 @@ impl Instance {unsafe { &mut self.get_unchecked_mut().store }}- fn dropped_elements_mut(self: Pin<&mut Self>) -> &mut EntitySet<ElemIndex> {+ fn dropped_elements_mut(self: Pin<&mut Self>) -> &mut TryEntitySet<ElemIndex> {// SAFETY: see `store_mut` above.unsafe { &mut self.get_unchecked_mut().dropped_elements }}- fn dropped_data_mut(self: Pin<&mut Self>) -> &mut EntitySet<DataIndex> {+ fn dropped_data_mut(self: Pin<&mut Self>) -> &mut TryEntitySet<DataIndex> {// SAFETY: see `store_mut` above.unsafe { &mut self.get_unchecked_mut().dropped_data }}