test passes with modified wasmtime

Author: cpetig

Cargo.lock

@@ -1665,8 +1665,14 @@ impl<'a> wit_bindgen_core::AnonymousTypeGenerator<'a> for InterfaceGenerator<'a>
     fn anonymous_type_type(&mut self, _id: TypeId, _ty: &Type, _docs: &Docs) {
         todo!("print_anonymous_type for type");
     }
-    
-    fn anonymous_type_fixed_size_list(&mut self, _id: TypeId, _ty: &Type, _size: u32, _docs: &Docs) {
+
+    fn anonymous_type_fixed_size_list(
+        &mut self,
+        _id: TypeId,
+        _ty: &Type,
+        _size: u32,
+        _docs: &Docs,
+    ) {
         todo!("print_anonymous_type for fixed size list");
     }
 }

crates/c/src/lib.rs

@@ -1779,12 +1779,15 @@ impl<'a, B: Bindgen> Generator<'a, B> {
 
                 TypeDefKind::Unknown => unreachable!(),
                 TypeDefKind::FixedSizeList(ty, size) => {
-                    let increment = self.bindgen.sizes().size(ty);
-                    let mut position = offset;
-                    for _ in 0..*size {
-                        self.write_to_memory(ty, addr.clone(), position);
-                        position = position + increment;
-                    }
+                    // let increment = self.bindgen.sizes().size(ty);
+                    // let mut position = offset;
+                    //                    let resultvar = self.stack[0];
+                    // for _ in 0..*size {
+                    //     // push index
+                    //     self.stack.push("", );
+                    //     self.write_to_memory(ty, addr.clone(), position);
+                    //     position = position + increment;
+                    // }
                     self.emit(&FixedSizeListLower {
                         elements: ty,
                         size: *size,

crates/core/src/abi.rs

@@ -1214,7 +1214,7 @@ impl Bindgen for FunctionBindgen<'_, '_> {
             } => {
                 let tmp = self.tmp();
                 let result = format!("result{tmp}");
-                self.push_str(&format!("let mut {result} = [",));
+                self.push_str(&format!("let {result} = [",));
                 for a in operands.drain(0..(*size as usize)) {
                     self.push_str(&a);
                     self.push_str(", ");

crates/rust/src/bindgen.rs

@@ -2930,6 +2930,6 @@ impl<'a, 'b> wit_bindgen_core::AnonymousTypeGenerator<'a> for AnonTypeGenerator<
                 style: TypeOwnershipStyle::Owned,
             },
         );
-        self.interface.push_str(&format!(", {size}]"));
+        self.interface.push_str(&format!("; {size}]"));
     }
 }

crates/rust/src/interface.rs

@@ -24,9 +24,9 @@ regex = "1.11.1"
 serde = { workspace = true }
 toml = "0.8.20"
 wasi-preview1-component-adapter-provider = "30.0.2"
-wac-parser = "0.6.1"
-wac-types = "0.6.1"
-wac-graph = "0.6.1"
+wac-parser = { path = "../../../wac/crates/wac-parser" }
+wac-types = { path = "../../../wac/crates/wac-types" }
+wac-graph = { path = "../../../wac/crates/wac-graph" }
 wasm-compose = { workspace = true }
 indexmap = { workspace = true }
 wasm-encoder = { workspace = true }

crates/test/Cargo.toml

@@ -1,6 +1,8 @@
 include!(env!("BINDINGS"));
 
-use test::lists::to_test::*;
+use test::fixed_size_lists::to_test::*;
 
 fn main() {
+    list_param([1,2,3,4]);
+    list_param2([[1,2],[3,4]]);
 }

tests/runtime/fixed-size-list/runner.rs

@@ -4,5 +4,8 @@ struct Component;
 
 export!(Component);
 
-impl exports::test::lists::to_test::Guest for Component {
+impl exports::test::fixed_size_lists::to_test::Guest for Component {
+    fn list_param(_a: [u32; 4]) {}
+    fn list_param2(_a: [[u32; 2]; 2]) {}
+    // fn list_param3(_a: [i32; 20]) {}
 }

tests/runtime/fixed-size-list/test.rs

@@ -1,16 +1,16 @@
-package test:lists;
+package test:fixed-size-lists;
 
 interface to-test {
   list-param: func(a: list<u32, 4>);
   list-param2: func(a: list<list<u32, 2>, 2>);
-  list-param3: func(a: list<s32, 20>);
-  list-result: func() -> list<u8, 8>;
+  // list-param3: func(a: list<s32, 20>);s
+  //list-result: func() -> list<u8, 8>;
 
-  list-minmax16: func(a: list<u16, 4>, b: list<s16, 4>) -> tuple<list<u16, 4>, list<s16, 4>>;
-  list-minmax-float: func(a: list<f32, 2>, b: list<f64, 2>)
-    -> tuple<list<f32, 2>, list<f64, 2>>;
+  // list-minmax16: func(a: list<u16, 4>, b: list<s16, 4>) -> tuple<list<u16, 4>, list<s16, 4>>;
+  // list-minmax-float: func(a: list<f32, 2>, b: list<f64, 2>)
+  //   -> tuple<list<f32, 2>, list<f64, 2>>;
 
-  list-roundtrip: func(a: list<u8, 12>) -> list<u8, 12>;
+  // list-roundtrip: func(a: list<u8, 12>) -> list<u8, 12>;
 }
 
 world test {