Merge pull request #22 from peterhuene/fix-merge

Fix merge of disjoint interfaces.

Author: peterhuene

crates/wac-parser/src/resolution/ast.rs

@@ -445,6 +445,7 @@ impl<'a> AstResolver<'a> {
 
         let mut ty = Interface {
             id: None,
+            remapped_types: Default::default(),
             uses: Default::default(),
             exports: Default::default(),
         };
@@ -483,6 +484,7 @@ impl<'a> AstResolver<'a> {
 
         let mut ty = Interface {
             id: Some(self.id(decl.id.string)),
+            remapped_types: Default::default(),
             uses: Default::default(),
             exports: Default::default(),
         };
@@ -1898,7 +1900,13 @@ impl<'a> AstResolver<'a> {
                             .with_context(|| format!("mismatched type for export `{name}`")),
                     ) {
                         (Ok(_), Ok(_)) => {
-                            // The two are compatible, so do nothing
+                            // The two are compatible, check for remapped type
+                            match (*target_kind, *source_kind) {
+                                (ItemKind::Type(new), ItemKind::Type(old)) if new != old => {
+                                    target.remapped_types.entry(new).or_default().insert(old);
+                                }
+                                _ => {}
+                            }
                         }
                         (Err(e), _) | (_, Err(e)) => {
                             // Neither is a subtype of the other, so error

crates/wac-parser/src/resolution/encoding.rs

@@ -620,7 +620,17 @@ impl<'a> TypeEncoder<'a> {
         // Otherwise, export all exports
         for (name, kind) in &interface.exports {
             match kind {
-                ItemKind::Type(_) | ItemKind::Resource(_) => {
+                ItemKind::Type(ty) => {
+                    let index = self.export(state, name, *kind)?;
+
+                    // Map the encoded type index to any remapped types.
+                    if let Some(prev) = interface.remapped_types.get(ty) {
+                        for ty in prev {
+                            state.current.type_indexes.insert(*ty, index);
+                        }
+                    }
+                }
+                ItemKind::Resource(_) => {
                     self.export(state, name, *kind)?;
                 }
                 _ => {

crates/wac-parser/src/resolution/package.rs

@@ -364,6 +364,7 @@ impl<'a> TypeConverter<'a> {
         let instance_ty = &types[id];
         let id = self.definitions.interfaces.alloc(Interface {
             id: name.and_then(|n| n.contains(':').then(|| n.to_owned())),
+            remapped_types: Default::default(),
             uses: Default::default(),
             exports: IndexMap::with_capacity(instance_ty.exports.len()),
         });

crates/wac-parser/src/resolution/types.rs

@@ -387,6 +387,15 @@ pub struct Interface {
     ///
     /// This may be `None` for inline interfaces.
     pub id: Option<String>,
+    /// Represents a remapping of types that may occur when an interface is merged.
+    ///
+    /// The map is from the type present in this interface to a set of types
+    /// originating from the merged interfaces.
+    ///
+    /// Encoding uses this map to populate the encoded type index map for the
+    /// original types.
+    #[serde(skip)]
+    pub remapped_types: IndexMap<Type, IndexSet<Type>>,
     /// A map from used interface to set of used type export indexes.
     #[serde(serialize_with = "serialize_id_key_map")]
     pub uses: IndexMap<InterfaceId, IndexSet<usize>>,

crates/wac-parser/tests/encoding/merged-functions.wac

@@ -0,0 +1,9 @@
+package test:comp;
+
+let a = new foo:bar {
+    ...
+};
+
+let b = new foo:baz {
+    ...
+};

crates/wac-parser/tests/encoding/merged-functions.wat.result

@@ -0,0 +1,52 @@
+(component
+  (type (;0;)
+    (instance
+      (type (;0;) (record (field "x" u32)))
+      (export (;1;) "x" (type (eq 0)))
+      (type (;2;) (func (param "x" 1)))
+      (export (;0;) "y" (func (type 2)))
+      (type (;3;) (func (param "x" 1)))
+      (export (;1;) "z" (func (type 3)))
+    )
+  )
+  (import "foo:bar/baz" (instance (;0;) (type 0)))
+  (type (;1;)
+    (component
+      (type (;0;)
+        (instance
+          (type (;0;) (record (field "x" u32)))
+          (export (;1;) "x" (type (eq 0)))
+          (type (;2;) (func (param "x" 1)))
+          (export (;0;) "y" (func (type 2)))
+        )
+      )
+      (import "foo:bar/baz" (instance (;0;) (type 0)))
+    )
+  )
+  (import "unlocked-dep=<foo:bar>" (component (;0;) (type 1)))
+  (instance (;1;) (instantiate 0
+      (with "foo:bar/baz" (instance 0))
+    )
+  )
+  (type (;2;)
+    (component
+      (type (;0;)
+        (instance
+          (type (;0;) (record (field "x" u32)))
+          (export (;1;) "x" (type (eq 0)))
+          (type (;2;) (func (param "x" 1)))
+          (export (;0;) "z" (func (type 2)))
+        )
+      )
+      (import "foo:bar/baz" (instance (;0;) (type 0)))
+    )
+  )
+  (import "unlocked-dep=<foo:baz>" (component (;1;) (type 2)))
+  (instance (;2;) (instantiate 1
+      (with "foo:bar/baz" (instance 0))
+    )
+  )
+  (@producers
+    (processed-by "wac-parser" "0.1.0")
+  )
+)

crates/wac-parser/tests/encoding/merged-functions/foo/bar.wat

@@ -0,0 +1,7 @@
+(component
+  (import "foo:bar/baz" (instance
+    (type (record (field "x" u32)))
+    (export "x" (type (eq 0)))
+    (export "y" (func (param "x" 1)))
+  ))
+)

crates/wac-parser/tests/encoding/merged-functions/foo/baz.wat

@@ -0,0 +1,7 @@
+(component
+  (import "foo:bar/baz" (instance
+    (type (record (field "x" u32)))
+    (export "x" (type (eq 0)))
+    (export "z" (func (param "x" 1)))
+  ))
+)