Update to wasm-tools v229

Cargo.toml

@@ -41,11 +41,11 @@ wasmi_fuzz = { version = "0.46.0", path = "crates/fuzz" }
 wasmi_wast = { version = "0.46.0", path = "crates/wast" }
 
 # wasm-tools dependencies
-wat = { version = "1.228.0", default-features = false }
-wast = { version = "228.0.0", default-features = false }
-wasmparser = { version = "0.228.0", default-features = false }
-wasm-smith = "0.228.0"
-wasmprinter = { version = "0.228.0", default-features = false }
+wat = { version = "1.229.0", default-features = false }
+wast = { version = "229.0.0", default-features = false }
+wasmparser = { version = "0.229.0", default-features = false }
+wasm-smith = "0.229.0"
+wasmprinter = { version = "0.229.0", default-features = false }
 
 # Wasmtime dependencies
 wasi-common = { version = "31.0.0", default-features = false }

crates/wasmi/src/engine/translator/driver.rs

@@ -84,7 +84,7 @@ where
             self.translator.update_pos(pos);
             reader.visit_operator(&mut self.translator)??;
         }
-        reader.ensure_end()?;
+        reader.finish()?;
         Ok(reader.original_position())
     }
 }

crates/wasmi/src/engine/translator/mod.rs

@@ -356,12 +356,7 @@ where
         self.pos = pos;
     }
 
-    fn finish(
-        mut self,
-        finalize: impl FnOnce(CompiledFuncEntity),
-    ) -> Result<Self::Allocations, Error> {
-        let pos = self.current_pos();
-        self.validator.finish(pos)?;
+    fn finish(self, finalize: impl FnOnce(CompiledFuncEntity)) -> Result<Self::Allocations, Error> {
         let translation = self.translator.finish(finalize)?;
         let validation = self.validator.into_allocations();
         let allocations = ReusableAllocations {

crates/wasmi/src/module/init_expr.rs

@@ -311,7 +311,7 @@ impl ConstExpr {
             };
         }
         reader
-            .ensure_end()
+            .finish()
             .expect("due to Wasm validation this is guaranteed to succeed");
         let op = stack
             .pop()

crates/wasmi/src/module/parser.rs

@@ -16,6 +16,7 @@ use crate::{
     Error,
     FuncType,
     MemoryType,
+    Module,
     TableType,
 };
 use alloc::boxed::Box;
@@ -38,9 +39,6 @@ use wasmparser::{
     Validator,
 };
 
-#[cfg(doc)]
-use crate::Module;
-
 mod buffered;
 mod streaming;
 
@@ -54,8 +52,6 @@ pub struct ModuleParser {
     parser: WasmParser,
     /// The number of compiled or processed functions.
     engine_funcs: u32,
-    /// Flag, `true` when `stream` is at the end.
-    eof: bool,
 }
 
 impl ModuleParser {
@@ -68,10 +64,16 @@ impl ModuleParser {
             validator: None,
             parser,
             engine_funcs: 0,
-            eof: false,
         }
     }
 
+    /// Finish Wasm module parsing and returns the resulting [`Module`].
+    fn finish(&mut self, offset: usize, builder: ModuleBuilder) -> Result<Module, Error> {
+        self.process_end(offset)?;
+        let module = builder.finish(&self.engine);
+        Ok(module)
+    }
+
     /// Processes the end of the Wasm binary.
     fn process_end(&mut self, offset: usize) -> Result<(), Error> {
         if let Some(validator) = &mut self.validator {
@@ -455,7 +457,7 @@ impl ModuleParser {
             }
         }
         if let Some(validator) = &mut self.validator {
-            validator.code_section_start(count, &range)?;
+            validator.code_section_start(&range)?;
         }
         Ok(())
     }