Merge pull request #28 from dhil/wasmfx-merge

Merge with upstream

Author: dhil

Cargo.lock

@@ -18,7 +18,7 @@ resolver = "2"
 
 [workspace.package]
 edition = "2021"
-version = "0.32.0"
+version = "0.33.0"
 license = "Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT"
 repository = "https://github.com/bytecodealliance/wasi-rs"
 
@@ -32,21 +32,21 @@ indexmap = "2.0.0"
 prettyplease = "0.2.20"
 syn = { version = "2.0", features = ["printing"] }
 
-wasmparser    = { git = "https://github.com/wasmfx/wasmfx-tools", tag = "v1.217.0" }
-wasm-metadata = { git = "https://github.com/wasmfx/wasmfx-tools", tag = "v1.217.0" }
-wasm-encoder  = { git = "https://github.com/wasmfx/wasmfx-tools", tag = "v1.217.0" }
-wit-parser    = { git = "https://github.com/wasmfx/wasmfx-tools", tag = "v1.217.0" }
-wit-component = { git = "https://github.com/wasmfx/wasmfx-tools", tag = "v1.217.0" }
+wasmparser    = { git = "https://github.com/wasmfx/wasmfx-tools", tag = "v1.218.0" }
+wasm-metadata = { git = "https://github.com/wasmfx/wasmfx-tools", tag = "v1.218.0" }
+wasm-encoder  = { git = "https://github.com/wasmfx/wasmfx-tools", tag = "v1.218.0" }
+wit-parser    = { git = "https://github.com/wasmfx/wasmfx-tools", tag = "v1.218.0" }
+wit-component = { git = "https://github.com/wasmfx/wasmfx-tools", tag = "v1.218.0" }
 
-wit-bindgen-core = { path = 'crates/core', version = '0.32.0' }
-wit-bindgen-c = { path = 'crates/c', version = '0.32.0' }
-wit-bindgen-rust = { path = "crates/rust", version = "0.32.0" }
-wit-bindgen-teavm-java = { path = 'crates/teavm-java', version = '0.32.0' }
-wit-bindgen-go = { path = 'crates/go', version = '0.32.0' }
-wit-bindgen-csharp = { path = 'crates/csharp', version = '0.32.0' }
-wit-bindgen-markdown = { path = 'crates/markdown', version = '0.32.0' }
-wit-bindgen-moonbit = { path = 'crates/moonbit', version = '0.32.0' }
-wit-bindgen = { path = 'crates/guest-rust', version = '0.32.0', default-features = false }
+wit-bindgen-core = { path = 'crates/core', version = '0.33.0' }
+wit-bindgen-c = { path = 'crates/c', version = '0.33.0' }
+wit-bindgen-rust = { path = "crates/rust", version = "0.33.0" }
+wit-bindgen-teavm-java = { path = 'crates/teavm-java', version = '0.33.0' }
+wit-bindgen-go = { path = 'crates/go', version = '0.33.0' }
+wit-bindgen-csharp = { path = 'crates/csharp', version = '0.33.0' }
+wit-bindgen-markdown = { path = 'crates/markdown', version = '0.33.0' }
+wit-bindgen-moonbit = { path = 'crates/moonbit', version = '0.33.0' }
+wit-bindgen = { path = 'crates/guest-rust', version = '0.33.0', default-features = false }
 
 [[bin]]
 name = "wit-bindgen"
@@ -86,8 +86,8 @@ moonbit = ['dep:wit-bindgen-moonbit']
 
 [dev-dependencies]
 heck = { workspace = true }
-wasmtime = { version = "24.0.0", features = ['component-model'] }
-wasmtime-wasi =  { version = "24.0.0" }
+wasmtime = { version = "25.0.0", features = ['component-model'] }
+wasmtime-wasi =  { version = "25.0.0" }
 test-artifacts = { path = 'crates/test-rust-wasm/artifacts' }
 wit-parser = { workspace = true }
 wasmparser = { workspace = true }

Cargo.toml

@@ -23,7 +23,7 @@ pub fn object(
 
     // Build a module with one function that's a "dummy function"
     let mut types = TypeSection::new();
-    types.function([], []);
+    types.ty().function([], []);
     module.section(&types);
     let mut funcs = FunctionSection::new();
     funcs.function(0);

crates/c/src/component_type_object.rs

@@ -1956,6 +1956,7 @@ struct FunctionBindgen<'a, 'b> {
     blocks: Vec<Block>,
     payloads: Vec<String>,
     needs_cleanup_list: bool,
+    needs_native_alloc_list: bool,
     cleanup: Vec<Cleanup>,
     import_return_pointer_area_size: usize,
     import_return_pointer_area_align: usize,
@@ -1989,6 +1990,7 @@ impl<'a, 'b> FunctionBindgen<'a, 'b> {
             blocks: Vec::new(),
             payloads: Vec::new(),
             needs_cleanup_list: false,
+            needs_native_alloc_list: false,
             cleanup: Vec::new(),
             import_return_pointer_area_size: 0,
             import_return_pointer_area_align: 0,
@@ -2185,7 +2187,7 @@ impl Bindgen for FunctionBindgen<'_, '_> {
             Instruction::F64Load { offset } => results.push(format!("BitConverter.ToDouble(new Span<byte>((void*)({} + {offset}), 8))",operands[0])),
             Instruction::I32Store { offset }
             | Instruction::PointerStore { offset }
-            | Instruction::LengthStore { offset } => uwriteln!(self.src, "BitConverter.TryWriteBytes(new Span<byte>((void*)({} + {offset}), 4), unchecked((int){}));", operands[1], operands[0]),
+            | Instruction::LengthStore { offset } => uwriteln!(self.src, "BitConverter.TryWriteBytes(new Span<byte>((void*)({} + {offset}), 4), {});", operands[1], operands[0]),
             Instruction::I32Store8 { offset } => uwriteln!(self.src, "*(byte*)({} + {offset}) = (byte){};", operands[1], operands[0]),
             Instruction::I32Store16 { offset } => uwriteln!(self.src, "BitConverter.TryWriteBytes(new Span<byte>((void*)({} + {offset}), 2), (short){});", operands[1], operands[0]),
             Instruction::I64Store { offset } => uwriteln!(self.src, "BitConverter.TryWriteBytes(new Span<byte>((void*)({} + {offset}), 8), unchecked((long){}));", operands[1], operands[0]),
@@ -2601,16 +2603,18 @@ impl Bindgen for FunctionBindgen<'_, '_> {
                 let ty = self.gen.type_name_with_qualifier(element, true);
                 let index = self.locals.tmp("index");
 
-                let buffer: String = self.locals.tmp("buffer");
-                let gc_handle = self.locals.tmp("gcHandle");
                 let address = self.locals.tmp("address");
+                let buffer_size = self.locals.tmp("bufferSize");
+                //TODO: wasm64
+                let align = self.gen.gen.sizes.align(element).align_wasm32();
+                self.needs_native_alloc_list = true;
 
                 uwrite!(
                     self.src,
                     "
-                    byte[] {buffer} = new byte[{size} * {list}.Count];
-                    var {gc_handle} = GCHandle.Alloc({buffer}, GCHandleType.Pinned);
-                    var {address} = {gc_handle}.AddrOfPinnedObject();
+                    var {buffer_size} = {size} * (nuint){list}.Count;
+                    var {address} = NativeMemory.AlignedAlloc({buffer_size}, {align});
+                    nativeAllocs.Add((IntPtr){address});
 
                     for (int {index} = 0; {index} < {list}.Count; ++{index}) {{
                         {ty} {block_element} = {list}[{index}];
@@ -2620,12 +2624,6 @@ impl Bindgen for FunctionBindgen<'_, '_> {
                     "
                 );
 
-                if realloc.is_none() {
-                    self.cleanup.push(Cleanup {
-                        address: gc_handle.clone(),
-                    });
-                }
-
                 results.push(format!("(int){address}"));
                 results.push(format!("{list}.Count"));
             }
@@ -2829,6 +2827,17 @@ impl Bindgen for FunctionBindgen<'_, '_> {
                     uwriteln!(self.src, "{address}.Free();");
                 }
 
+                if self.needs_native_alloc_list {
+                    self.src.insert_str(0, "var nativeAllocs = new List<IntPtr>();
+                        ");
+
+                    uwriteln!(self.src, "\
+                        foreach (var nativeAlloc in nativeAllocs)
+                        {{
+                            NativeMemory.AlignedFree((void*)nativeAlloc);
+                        }}");
+                }
+
                 if !matches!((self.gen.direction, self.kind), (Direction::Import, FunctionKind::Constructor(_))) {
                     match func.results.len() {
                         0 => (),
@@ -2920,7 +2929,7 @@ impl Bindgen for FunctionBindgen<'_, '_> {
                     Direction::Export => {
                         self.gen.gen.needs_rep_table = true;
                         let local_rep = self.locals.tmp("localRep");
-			let export_name = self.gen.gen.all_resources[&id].export_impl_name();
+                        let export_name = self.gen.gen.all_resources[&id].export_impl_name();
                         if is_own {
                             // Note that we set `{op}.Handle` to zero below to ensure that application code doesn't
                             // try to use the instance while the host has ownership.  We'll set it back to non-zero

crates/csharp/src/lib.rs

@@ -12,8 +12,8 @@ Used when compiling Rust programs to the component model.
 """
 
 [dependencies]
-wit-bindgen-rust-macro = { path = "./macro", optional = true, version = "0.32.0" }
-wit-bindgen-rt = { path = "./rt", version = "0.32.0", features = ["bitflags"] }
+wit-bindgen-rust-macro = { path = "./macro", optional = true, version = "0.33.0" }
+wit-bindgen-rt = { path = "./rt", version = "0.33.0", features = ["bitflags"] }
 
 [features]
 default = ["macros", "realloc"]

crates/guest-rust/Cargo.toml

@@ -2,9 +2,9 @@
 
 #include <stdint.h>
 
-extern void *cabi_realloc_wit_bindgen_0_32_0(void *ptr, size_t old_size, size_t align, size_t new_size);
+extern void *cabi_realloc_wit_bindgen_0_33_0(void *ptr, size_t old_size, size_t align, size_t new_size);
 
 __attribute__((__weak__, __export_name__("cabi_realloc")))
 void *cabi_realloc(void *ptr, size_t old_size, size_t align, size_t new_size) {
-  return cabi_realloc_wit_bindgen_0_32_0(ptr, old_size, align, new_size);
+  return cabi_realloc_wit_bindgen_0_33_0(ptr, old_size, align, new_size);
 }

crates/guest-rust/rt/src/cabi_realloc.c

@@ -1,7 +1,7 @@
 // This file is generated by ./ci/rebuild-libcabi-realloc.sh
 
 #[no_mangle]
-pub unsafe extern "C" fn cabi_realloc_wit_bindgen_0_32_0(
+pub unsafe extern "C" fn cabi_realloc_wit_bindgen_0_33_0(
     old_ptr: *mut u8,
     old_len: usize,
     align: usize,

crates/guest-rust/rt/src/cabi_realloc.o

@@ -111,34 +111,34 @@ extern "wasm" fn copy_inline(dest : Int, src : Int, len : Int) =
   #|(func (param i32) (param i32) (param i32) local.get 0 local.get 1 local.get 2 memory.copy)
 
 pub extern "wasm" fn str2ptr(str : String) -> Int =
-  #|(func (param i32) (result i32) local.get 0 call $moonbit.decref local.get 0 i32.const 8 i32.add)
+  #|(func (param i32) (result i32) local.get 0 i32.const 8 i32.add)
 
 pub extern "wasm" fn ptr2str(ptr : Int) -> String =
   #|(func (param i32) (result i32) local.get 0 i32.const 4 i32.sub i32.const 243 i32.store8 local.get 0 i32.const 8 i32.sub)
 
 pub extern "wasm" fn bytes2ptr(bytes : Bytes) -> Int =
-  #|(func (param i32) (result i32) local.get 0 call $moonbit.decref local.get 0 i32.const 8 i32.add)
+  #|(func (param i32) (result i32) local.get 0 i32.const 8 i32.add)
 
 pub extern "wasm" fn ptr2bytes(ptr : Int) -> Bytes =
   #|(func (param i32) (result i32) local.get 0 i32.const 8 i32.sub)
 
 pub extern "wasm" fn uint_array2ptr(array : FixedArray[UInt]) -> Int =
-  #|(func (param i32) (result i32) local.get 0 call $moonbit.decref local.get 0 i32.const 8 i32.add)
+  #|(func (param i32) (result i32) local.get 0 i32.const 8 i32.add)
 
 pub extern "wasm" fn uint64_array2ptr(array : FixedArray[UInt64]) -> Int =
-  #|(func (param i32) (result i32) local.get 0 call $moonbit.decref local.get 0 i32.const 8 i32.add)
+  #|(func (param i32) (result i32) local.get 0 i32.const 8 i32.add)
 
 pub extern "wasm" fn int_array2ptr(array : FixedArray[Int]) -> Int =
-  #|(func (param i32) (result i32) local.get 0 call $moonbit.decref local.get 0 i32.const 8 i32.add)
+  #|(func (param i32) (result i32) local.get 0 i32.const 8 i32.add)
 
 pub extern "wasm" fn int64_array2ptr(array : FixedArray[Int64]) -> Int =
-  #|(func (param i32) (result i32) local.get 0 call $moonbit.decref local.get 0 i32.const 8 i32.add)
+  #|(func (param i32) (result i32) local.get 0 i32.const 8 i32.add)
 
 pub extern "wasm" fn float_array2ptr(array : FixedArray[Float]) -> Int =
-  #|(func (param i32) (result i32) local.get 0 call $moonbit.decref local.get 0 i32.const 8 i32.add)
+  #|(func (param i32) (result i32) local.get 0 i32.const 8 i32.add)
 
 pub extern "wasm" fn double_array2ptr(array : FixedArray[Double]) -> Int =
-  #|(func (param i32) (result i32) local.get 0 call $moonbit.decref local.get 0 i32.const 8 i32.add)
+  #|(func (param i32) (result i32) local.get 0 i32.const 8 i32.add)
 
 pub extern "wasm" fn ptr2uint_array(ptr : Int) -> FixedArray[UInt] =
   #|(func (param i32) (result i32) local.get 0 i32.const 4 i32.sub i32.const 241 i32.store8 local.get 0 i32.const 8 i32.sub)
@@ -575,11 +575,17 @@ impl WorldGenerator for MoonBit {
                 {ffi_qualifier}free(src_offset)
                 dst
             }}
-
-            let return_area : Int = {ffi_qualifier}malloc({})
-            ",
-            self.return_area_size,
+            "
         );
+        if self.return_area_size != 0 {
+            uwriteln!(
+                &mut body,
+                "
+                let return_area : Int = {ffi_qualifier}malloc({})
+                ",
+                self.return_area_size,
+            );
+        }
         files.push(&format!("{EXPORT_DIR}/ffi.mbt"), indent(&body).as_bytes());
         self.export
             .insert("cabi_realloc".into(), "cabi_realloc".into());
@@ -797,7 +803,7 @@ impl InterfaceGenerator<'_> {
             .collect::<Vec<_>>()
             .join(", ");
 
-        let sig = self.sig_string(func);
+        let sig = self.sig_string(func, false);
 
         uwriteln!(
             self.ffi,
@@ -820,7 +826,7 @@ impl InterfaceGenerator<'_> {
     fn export(&mut self, interface_name: Option<&str>, func: &Function) {
         let sig = self.resolve.wasm_signature(AbiVariant::GuestExport, func);
 
-        let func_sig = self.sig_string(func);
+        let func_sig = self.sig_string(func, true);
 
         let export_name = func.core_export_name(interface_name);
 
@@ -1039,7 +1045,7 @@ impl InterfaceGenerator<'_> {
         }
     }
 
-    fn sig_string(&mut self, func: &Function) -> String {
+    fn sig_string(&mut self, func: &Function, ignore_param: bool) -> String {
         let name = match func.kind {
             FunctionKind::Freestanding => func.name.to_moonbit_ident(),
             FunctionKind::Constructor(_) => {
@@ -1074,7 +1080,11 @@ impl InterfaceGenerator<'_> {
             .iter()
             .map(|(name, ty)| {
                 let ty = self.type_name(ty, true);
-                let name = name.to_moonbit_ident();
+                let name = if ignore_param {
+                    format!("_{}", name.to_moonbit_ident())
+                } else {
+                    name.to_moonbit_ident()
+                };
                 format!("{name} : {ty}")
             })
             .collect::<Vec<_>>()
@@ -1202,7 +1212,7 @@ impl<'a> wit_bindgen_core::InterfaceGenerator<'a> for InterfaceGenerator<'a> {
                 &mut self.stub,
                 r#"
                 /// Destructor of the resource.
-                pub fn {name}::dtor(self : {name}) -> Unit {{
+                pub fn {name}::dtor(_self : {name}) -> Unit {{
                   abort("todo")
                 }}
                 "#
@@ -1570,8 +1580,10 @@ impl<'a, 'b> FunctionBindgen<'a, 'b> {
                     .collect::<Vec<_>>()
                     .join(", ");
 
-                let payload = if self.gen.non_empty_type(ty.as_ref()).is_some() || is_result {
+                let payload = if self.gen.non_empty_type(ty.as_ref()).is_some() {
                     payload
+                } else if is_result {
+                    format!("_{payload}")
                 } else {
                     String::new()
                 };
@@ -1601,7 +1613,6 @@ impl<'a, 'b> FunctionBindgen<'a, 'b> {
                 r#"
                 match {op} {{
                     {cases}
-                    _ => panic()
                 }}
                 "#
             );
@@ -1611,7 +1622,6 @@ impl<'a, 'b> FunctionBindgen<'a, 'b> {
                 r#"
                 let ({declarations}) = match {op} {{
                     {cases}
-                    _ => panic()
                 }}
                 "#
             );
@@ -2109,13 +2119,14 @@ impl Bindgen for FunctionBindgen<'_, '_> {
                 Type::U8 => {
                     let result = self.locals.tmp("result");
                     let address = &operands[0];
-                    let _length = &operands[1];
+                    let length = &operands[1];
 
                     uwrite!(
                         self.src,
                         "
-                    let {result} = {ffi_qualifier}ptr2bytes({address})
-                    "
+                        ignore({length})
+                        let {result} = {ffi_qualifier}ptr2bytes({address})
+                        "
                     );
 
                     results.push(result);
@@ -2132,13 +2143,14 @@ impl Bindgen for FunctionBindgen<'_, '_> {
 
                     let result = self.locals.tmp("result");
                     let address = &operands[0];
-                    let _length = &operands[1];
+                    let length = &operands[1];
 
                     uwrite!(
                         self.src,
                         "
-                    let {result} = {ffi_qualifier}ptr2{ty}_array({address})
-                    "
+                        ignore({length})
+                        let {result} = {ffi_qualifier}ptr2{ty}_array({address})
+                        "
                     );
 
                     results.push(result);
@@ -2159,11 +2171,12 @@ impl Bindgen for FunctionBindgen<'_, '_> {
             Instruction::StringLift { .. } => {
                 let result = self.locals.tmp("result");
                 let address = &operands[0];
-                let _length = &operands[1];
+                let length = &operands[1];
 
                 uwrite!(
                     self.src,
                     "
+                    ignore({length})
                     let {result} = {ffi_qualifier}ptr2str({address})
                     "
                 );
@@ -2502,6 +2515,7 @@ impl Bindgen for FunctionBindgen<'_, '_> {
                     "
                     match ({op}) {{
                         {cases}
+                        _ => panic()
                     }}
                     "
                 );
@@ -2750,7 +2764,7 @@ impl ToMoonBitIdent for str {
             "continue" | "for" | "match" | "if" | "pub" | "priv" | "readonly" | "break"
             | "raise" | "try" | "except" | "catch" | "else" | "enum" | "struct" | "type"
             | "trait" | "return" | "let" | "mut" | "while" | "loop" | "extern" | "with"
-            | "throw" | "init" | "main" | "test" | "in" => {
+            | "throw" | "init" | "main" | "test" | "in" | "guard" => {
                 format!("{self}_")
             }
             _ => self.to_snake_case(),