chore: update wirm to 5.0.0

This updates wirm to 5.0.0 to re-enable the custom section deleting functionality

Author: vados-cosmonic

Cargo.lock

@@ -15,7 +15,7 @@ anyhow = { version = "1.0.95", default-features = false }
 heck = { version = "0.5", default-features = false }
 rand = { version = "0.8", default-features = false }
 serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
-wirm = { version = "4.0.6", default-features = false }
+wirm = { version = "5.0.0", default-features = false }
 
 wasm-encoder = { version = "0.245.1", features = ["component-model", "std"] }
 wasmparser = { version = "0.245.1", features = [

Cargo.toml

@@ -17,6 +17,7 @@ use wit_bindgen_core::wit_parser::{
     WorldId, WorldItem,
 };
 use wit_component::StringEncoding;
+use wit_parser::Param;
 use wit_parser::abi::WasmType;
 use wit_parser::abi::{AbiVariant, WasmSignature};
 
@@ -771,7 +772,7 @@ impl JsBindgen<'_> {
 
     fn create_resource_map(&self, func: &Function) -> ResourceMap {
         let mut resource_map = BTreeMap::new();
-        for wit_parser::Param { ty, .. } in func.params.iter() {
+        for Param { ty, .. } in func.params.iter() {
             self.iter_resources(ty, &mut resource_map);
         }
         if let Some(ty) = func.result {

crates/spidermonkey-embedding-splicer/src/bindgen.rs

@@ -356,6 +356,15 @@ pub fn splice(
         );
     }
 
+    // we reencode the WASI world component data, so strip it out from the
+    // custom section
+    let maybe_component_section_id = module
+        .custom_sections
+        .get_id("component-type:bindings".to_string());
+    if let Some(component_section_id) = maybe_component_section_id {
+        module.delete_custom_section(component_section_id);
+    }
+
     // Extract the native instructions from sample functions
     // then inline the imported functions and main import gating function
     // (erasing sample functions in the process)
@@ -472,7 +481,7 @@ fn synthesize_import_functions(
         .unwrap();
 
     // Sets the return value on args from the stack
-    let args_ret_i32: Vec<wirm::wasmparser::Operator> = vec![
+    let args_ret_i32: Vec<Operator> = vec![
         Operator::I64ExtendI32U,
         Operator::I64Const {
             value: -545460846592,
@@ -776,7 +785,7 @@ fn synthesize_import_functions(
         builder.inject_at(
             0,
             InstrumentationMode::Before,
-            wirm::wasmparser::Operator::LocalSet {
+            Operator::LocalSet {
                 local_index: *idx_local,
             },
         );
@@ -789,7 +798,7 @@ fn synthesize_import_functions(
         {
             let ops_ro = builder.body.instructions.get_ops();
             for (idx, op) in ops_ro.iter().enumerate() {
-                if let wirm::wasmparser::Operator::I32Const { value } = op {
+                if let Operator::I32Const { value } = op {
                     // we specifically need the const "around" 3393
                     // which is the coreabi_sample_i32 table offset
                     if *value < 1000 || *value > 5000 {
@@ -800,8 +809,7 @@ fn synthesize_import_functions(
                     // in the base computation.
                     let mut base = *value;
                     if idx > 0
-                        && let wirm::wasmparser::Operator::GlobalGet { global_index } =
-                            &ops_ro[idx - 1]
+                        && let Operator::GlobalGet { global_index } = &ops_ro[idx - 1]
                         && let GlobalKind::Local(local_global) =
                             module.globals.get_kind(GlobalID(*global_index))
                         && let [InitInstr::Value(Value::I32(v))] =
@@ -819,25 +827,25 @@ fn synthesize_import_functions(
         builder.inject_at(
             table_instr_idx,
             InstrumentationMode::Before,
-            wirm::wasmparser::Operator::LocalGet {
+            Operator::LocalGet {
                 local_index: *idx_local,
             },
         );
         builder.inject_at(
             table_instr_idx + 1,
             InstrumentationMode::Before,
-            wirm::wasmparser::Operator::I32Add,
+            Operator::I32Add,
         );
 
         if delta != 0 {
-            builder.body.instructions.add_instr(
-                table_instr_idx,
-                wirm::wasmparser::Operator::I32Const { value: delta },
-            );
             builder
                 .body
                 .instructions
-                .add_instr(table_instr_idx, wirm::wasmparser::Operator::I32Add);
+                .add_instr(table_instr_idx, Operator::I32Const { value: delta });
+            builder
+                .body
+                .instructions
+                .add_instr(table_instr_idx, Operator::I32Add);
         }
     }
 

crates/spidermonkey-embedding-splicer/src/splice.rs

@@ -8,6 +8,7 @@ use wirm::ir::id::{FunctionID, LocalID};
 use wirm::ir::module::module_functions::FuncKind;
 use wirm::ir::types::{BlockType, InitExpr, Value};
 use wirm::module_builder::AddLocal;
+use wirm::wasmparser::{MemArg, TypeRef};
 use wirm::{DataType, InitInstr, Module, Opcode};
 use wit_parser::Resolve;
 
@@ -31,7 +32,7 @@ where
             continue;
         };
 
-        let wirm::wasmparser::TypeRef::Func(_) = module.imports.get(iid).ty else {
+        let TypeRef::Func(_) = module.imports.get(iid).ty else {
             bail!("'{full_import}#{name}' is not a function.")
         };
         let fid: FunctionID = FunctionID(*iid);
@@ -74,7 +75,7 @@ where
         return Ok(None);
     };
 
-    let wirm::wasmparser::TypeRef::Func(_) = module.imports.get(iid).ty else {
+    let TypeRef::Func(_) = module.imports.get(iid).ty else {
         bail!("'{import}#{name}' is not a function.")
     };
     let fid: FunctionID = FunctionID(*iid);
@@ -269,7 +270,7 @@ fn stub_random(module: &mut Module) -> Result<()> {
 
         // *retptr = outptr
         // *retptr + 1 = len
-        body.i32_store(wirm::wasmparser::MemArg {
+        body.i32_store(MemArg {
             align: 2,
             max_align: 0,
             offset: 0,
@@ -279,7 +280,7 @@ fn stub_random(module: &mut Module) -> Result<()> {
         body.local_get(retptr);
         body.local_get(num_bytes);
         body.i32_wrap_i64();
-        body.i32_store(wirm::wasmparser::MemArg {
+        body.i32_store(MemArg {
             align: 2,
             max_align: 0,
             offset: 4,
@@ -294,7 +295,7 @@ fn stub_random(module: &mut Module) -> Result<()> {
         body.loop_stmt(BlockType::Empty);
         body.local_get(curptr);
         body.call(random_u64);
-        body.i64_store(wirm::wasmparser::MemArg {
+        body.i64_store(MemArg {
             align: 3,
             max_align: 0,
             offset: 0,
@@ -351,7 +352,7 @@ fn stub_clocks(module: &mut Module) -> Result<()> {
         body.local_get(time_ptr);
         body.local_get(time_ptr);
         body.i64_const(i64::try_from(unix_time.as_nanos())?);
-        body.i64_store(wirm::wasmparser::MemArg {
+        body.i64_store(MemArg {
             align: 3,
             offset: 0,
             max_align: 0,