Merge pull request #32 from dhil/wasmfx-merge

Merge with upstream

Author: dhil

Cargo.lock

@@ -18,7 +18,7 @@ resolver = "2"
 
 [workspace.package]
 edition = "2021"
-version = "0.36.0"
+version = "0.37.0"
 license = "Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT"
 repository = "https://github.com/bytecodealliance/wasi-rs"
 
@@ -31,22 +31,23 @@ clap = { version = "4.3.19", features = ["derive"] }
 indexmap = "2.0.0"
 prettyplease = "0.2.20"
 syn = { version = "2.0.89", features = ["printing"] }
+futures = "0.3.31"
 
-wasmparser    = { git = "https://github.com/wasmfx/wasmfx-tools", tag = "v1.220.0" }
-wasm-metadata = { git = "https://github.com/wasmfx/wasmfx-tools", tag = "v1.220.0" }
-wasm-encoder  = { git = "https://github.com/wasmfx/wasmfx-tools", tag = "v1.220.0" }
-wit-parser    = { git = "https://github.com/wasmfx/wasmfx-tools", tag = "v1.220.0" }
-wit-component = { git = "https://github.com/wasmfx/wasmfx-tools", tag = "v1.220.0" }
+wasmparser    = { git = "https://github.com/wasmfx/wasmfx-tools", tag = "v1.223.0" }
+wasm-metadata = { git = "https://github.com/wasmfx/wasmfx-tools", tag = "v1.223.0" }
+wasm-encoder  = { git = "https://github.com/wasmfx/wasmfx-tools", tag = "v1.223.0" }
+wit-parser    = { git = "https://github.com/wasmfx/wasmfx-tools", tag = "v1.223.0" }
+wit-component = { git = "https://github.com/wasmfx/wasmfx-tools", tag = "v1.223.0" }
 
-wit-bindgen-core = { path = 'crates/core', version = '0.36.0' }
-wit-bindgen-c = { path = 'crates/c', version = '0.36.0' }
-wit-bindgen-rust = { path = "crates/rust", version = "0.36.0" }
-wit-bindgen-teavm-java = { path = 'crates/teavm-java', version = '0.36.0' }
-wit-bindgen-go = { path = 'crates/go', version = '0.36.0' }
-wit-bindgen-csharp = { path = 'crates/csharp', version = '0.36.0' }
-wit-bindgen-markdown = { path = 'crates/markdown', version = '0.36.0' }
-wit-bindgen-moonbit = { path = 'crates/moonbit', version = '0.36.0' }
-wit-bindgen = { path = 'crates/guest-rust', version = '0.36.0', default-features = false }
+wit-bindgen-core = { path = 'crates/core', version = '0.37.0' }
+wit-bindgen-c = { path = 'crates/c', version = '0.37.0' }
+wit-bindgen-rust = { path = "crates/rust", version = "0.37.0" }
+wit-bindgen-teavm-java = { path = 'crates/teavm-java', version = '0.37.0' }
+wit-bindgen-go = { path = 'crates/go', version = '0.37.0' }
+wit-bindgen-csharp = { path = 'crates/csharp', version = '0.37.0' }
+wit-bindgen-markdown = { path = 'crates/markdown', version = '0.37.0' }
+wit-bindgen-moonbit = { path = 'crates/moonbit', version = '0.37.0' }
+wit-bindgen = { path = 'crates/guest-rust', version = '0.37.0', default-features = false }
 
 [[bin]]
 name = "wit-bindgen"
@@ -74,6 +75,7 @@ default = [
   'go',
   'csharp',
   'moonbit',
+  'async',
 ]
 c = ['dep:wit-bindgen-c']
 rust = ['dep:wit-bindgen-rust']
@@ -83,6 +85,7 @@ go = ['dep:wit-bindgen-go']
 csharp = ['dep:wit-bindgen-csharp']
 csharp-mono = ['csharp']
 moonbit = ['dep:wit-bindgen-moonbit']
+async = []
 
 [dev-dependencies]
 heck = { workspace = true }

Cargo.toml

@@ -309,6 +309,56 @@ Like with Rust, you can then inspect the output binary:
 wasm-tools component wit ./my-component.wasm
 ```
 
+### Guest C#
+
+To generate the bindings:
+
+```
+wit-bindgen c-sharp -w command -r native-aot --generate-stub wit/
+```
+
+Now you create a c# project file:
+
+```
+dotnet new console -o MyApp
+cd MyApp
+dotnet new nugetconfig
+```
+
+In the `nuget.config` after `<clear />`make sure you have: 
+
+```
+<add key="dotnet-experimental" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-experimental/nuget/v3/index.json" />
+<add key="nuget" value="https://api.nuget.org/v3/index.json" />
+```
+
+In the MyApp.csproj add the following to the property group:
+
+```
+<RuntimeIdentifier>wasi-wasm</RuntimeIdentifier>
+<UseAppHost>false</UseAppHost>
+<PublishTrimmed>true</PublishTrimmed>
+<InvariantGlobalization>true</InvariantGlobalization>
+<SelfContained>true</SelfContained>
+<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+<WASI_SDK_PATH>path/to/wasi-sdk</WASI_SDK_PATH>
+```
+
+Add the native-aot compiler (substitute `win-x64` for `linux-x64` on Linux):
+
+```
+dotnet add package Microsoft.DotNet.ILCompiler.LLVM --prerelease 
+dotnet add package runtime.win-x64.Microsoft.DotNet.ILCompiler.LLVM --prerelease
+```
+
+Now you can build with:
+
+```
+dotnet publish
+```
+
+Checkout out [componentize-dotnet](https://github.com/bytecodealliance/componentize-dotnet) for a simplified experience.
+
 ### Guest: Java
 
 Java bytecode can be compiled to WebAssembly using

README.md

@@ -7,9 +7,9 @@
 # the `cabi_realloc` symbol from the final binary. This library, however,
 # is not stable which means that we're publishing new versions of `wit-bindgen`
 # over its development. This means that if `wit-bindgen`-the-crate were to
-# export a `#[no_mangle]` symbol of `cabi_realloc` then it wouldn't work to
-# have two versions of `wit-bindgen` in the same project. This can arise
-# relatively quickly, however, so this is something we want to solve.
+# export a `#[unsafe(no_mangle)]` symbol of `cabi_realloc` then it wouldn't
+# work to have two versions of `wit-bindgen` in the same project. This can
+# arise relatively quickly, however, so this is something we want to solve.
 #
 # The general idea of the solution here is to ensure that the `cabi_realloc`
 # symbol itself is declared as a weak symbol. A weakly-defined symbol means
@@ -46,7 +46,7 @@ sym=cabi_realloc_wit_bindgen_$version
 cat >./crates/guest-rust/rt/src/cabi_realloc.rs <<-EOF
 // This file is generated by $0
 
-#[no_mangle]
+#[unsafe(no_mangle)]
 pub unsafe extern "C" fn $sym(
     old_ptr: *mut u8,
     old_len: usize,

ci/rebuild-libcabi-realloc.sh

@@ -718,6 +718,7 @@ fn is_prim_type_id(resolve: &Resolve, id: TypeId) -> bool {
         | TypeDefKind::Result(_)
         | TypeDefKind::Future(_)
         | TypeDefKind::Stream(_)
+        | TypeDefKind::ErrorContext
         | TypeDefKind::Unknown => false,
     }
 }
@@ -779,8 +780,9 @@ pub fn push_ty_name(resolve: &Resolve, ty: &Type, src: &mut String) {
                     src.push_str("list_");
                     push_ty_name(resolve, ty, src);
                 }
-                TypeDefKind::Future(_) => unimplemented!(),
-                TypeDefKind::Stream(_) => unimplemented!(),
+                TypeDefKind::Future(_) => todo!(),
+                TypeDefKind::Stream(_) => todo!(),
+                TypeDefKind::ErrorContext => todo!(),
                 TypeDefKind::Handle(Handle::Own(resource)) => {
                     src.push_str("own_");
                     push_ty_name(resolve, &Type::Id(*resource), src);
@@ -893,7 +895,12 @@ pub fn c_func_name(
             !in_import,
             renamed_interfaces,
         )),
-        None => name.push_str(&world.to_snake_case()),
+        None => {
+            if !in_import {
+                name.push_str("exports_");
+            }
+            name.push_str(&world.to_snake_case());
+        }
     }
     name.push_str("_");
     name.push_str(&func.name.to_snake_case().replace('.', "_"));
@@ -992,6 +999,7 @@ impl Return {
 
             TypeDefKind::Future(_) => todo!("return_single for future"),
             TypeDefKind::Stream(_) => todo!("return_single for stream"),
+            TypeDefKind::ErrorContext => todo!("return_single for error-context"),
             TypeDefKind::Resource => todo!("return_single for resource"),
             TypeDefKind::Unknown => unreachable!(),
         }
@@ -1339,6 +1347,21 @@ void __wasm_export_{ns}_{snake}_dtor({ns}_{snake}_t* arg) {{
         self.finish_typedef_struct(id);
     }
 
+    fn type_future(&mut self, id: TypeId, name: &str, ty: &Option<Type>, docs: &Docs) {
+        _ = (id, name, ty, docs);
+        todo!()
+    }
+
+    fn type_stream(&mut self, id: TypeId, name: &str, ty: &Type, docs: &Docs) {
+        _ = (id, name, ty, docs);
+        todo!()
+    }
+
+    fn type_error_context(&mut self, id: TypeId, name: &str, docs: &Docs) {
+        _ = (id, name, docs);
+        todo!()
+    }
+
     fn type_builtin(&mut self, id: TypeId, name: &str, ty: &Type, docs: &Docs) {
         let _ = (id, name, ty, docs);
     }
@@ -1427,12 +1450,16 @@ impl<'a> wit_bindgen_core::AnonymousTypeGenerator<'a> for InterfaceGenerator<'a>
         todo!("print_anonymous_type for future");
     }
 
-    fn anonymous_type_stream(&mut self, _id: TypeId, _ty: &Stream, _docs: &Docs) {
+    fn anonymous_type_stream(&mut self, _id: TypeId, _ty: &Type, _docs: &Docs) {
         todo!("print_anonymous_type for stream");
     }
 
-    fn anonymous_typ_type(&mut self, _id: TypeId, _ty: &Type, _docs: &Docs) {
-        todo!("print_anonymous_type for typ");
+    fn anonymous_type_error_context(&mut self) {
+        todo!("print_anonymous_type for error-context");
+    }
+
+    fn anonymous_type_type(&mut self, _id: TypeId, _ty: &Type, _docs: &Docs) {
+        todo!("print_anonymous_type for type");
     }
 }
 
@@ -1605,6 +1632,7 @@ impl InterfaceGenerator<'_> {
             }
             TypeDefKind::Future(_) => todo!("print_dtor for future"),
             TypeDefKind::Stream(_) => todo!("print_dtor for stream"),
+            TypeDefKind::ErrorContext => todo!("print_dtor for error-context"),
             TypeDefKind::Resource => {}
             TypeDefKind::Handle(Handle::Borrow(id) | Handle::Own(id)) => {
                 self.free(&Type::Id(*id), "*ptr");
@@ -1750,6 +1778,7 @@ impl InterfaceGenerator<'_> {
             LiftLower::LowerArgsLiftResults,
             func,
             &mut f,
+            false,
         );
 
         let FunctionBindgen {
@@ -1822,6 +1851,7 @@ impl InterfaceGenerator<'_> {
             LiftLower::LiftArgsLowerResults,
             func,
             &mut f,
+            false,
         );
         let FunctionBindgen { src, .. } = f;
         self.src.c_adapters(&src);
@@ -1852,7 +1882,7 @@ impl InterfaceGenerator<'_> {
 
             let mut f = FunctionBindgen::new(self, c_sig, &import_name);
             f.params = params;
-            abi::post_return(f.gen.resolve, func, &mut f);
+            abi::post_return(f.gen.resolve, func, &mut f, false);
             let FunctionBindgen { src, .. } = f;
             self.src.c_fns(&src);
             self.src.c_fns("}\n");
@@ -2075,17 +2105,8 @@ impl InterfaceGenerator<'_> {
 
                 TypeDefKind::List(ty) => self.contains_droppable_borrow(ty),
 
-                TypeDefKind::Future(r) => r
-                    .as_ref()
-                    .map_or(false, |ty| self.contains_droppable_borrow(ty)),
-
-                TypeDefKind::Stream(s) => {
-                    s.element
-                        .as_ref()
-                        .map_or(false, |ty| self.contains_droppable_borrow(ty))
-                        || s.end
-                            .as_ref()
-                            .map_or(false, |ty| self.contains_droppable_borrow(ty))
+                TypeDefKind::Future(_) | TypeDefKind::Stream(_) | TypeDefKind::ErrorContext => {
+                    false
                 }
 
                 TypeDefKind::Type(ty) => self.contains_droppable_borrow(ty),
@@ -2753,7 +2774,7 @@ impl Bindgen for FunctionBindgen<'_, '_> {
                 self.src.push_str(");\n");
             }
 
-            Instruction::CallInterface { func } => {
+            Instruction::CallInterface { func, .. } => {
                 let mut args = String::new();
                 for (i, (op, (byref, _))) in operands.iter().zip(&self.sig.params).enumerate() {
                     if i > 0 {
@@ -3037,6 +3058,10 @@ impl Bindgen for FunctionBindgen<'_, '_> {
                 uwriteln!(self.src, "}}");
             }
 
+            Instruction::Flush { amt } => {
+                results.extend(operands.iter().take(*amt).map(|v| v.clone()));
+            }
+
             i => unimplemented!("{:?}", i),
         }
     }
@@ -3145,6 +3170,7 @@ pub fn is_arg_by_pointer(resolve: &Resolve, ty: &Type) -> bool {
             TypeDefKind::Tuple(_) | TypeDefKind::Record(_) | TypeDefKind::List(_) => true,
             TypeDefKind::Future(_) => todo!("is_arg_by_pointer for future"),
             TypeDefKind::Stream(_) => todo!("is_arg_by_pointer for stream"),
+            TypeDefKind::ErrorContext => todo!("is_arg_by_pointer for error-context"),
             TypeDefKind::Resource => todo!("is_arg_by_pointer for resource"),
             TypeDefKind::Unknown => unreachable!(),
         },

crates/c/src/lib.rs

@@ -6,6 +6,14 @@ use std::process::Command;
 use wit_parser::{Resolve, UnresolvedPackageGroup};
 
 macro_rules! codegen_test {
+    // TODO: implement support for stream, future, and error-context, and then
+    // remove these lines:
+    (streams $name:tt $test:tt) => {};
+    (futures $name:tt $test:tt) => {};
+    (resources_with_streams $name:tt $test:tt) => {};
+    (resources_with_futures $name:tt $test:tt) => {};
+    (error_context $name:tt $test:tt) => {};
+
     ($id:ident $name:tt $test:tt) => {
         #[test]
         fn $id() {