Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix generating shims with duplicate names #1851

Merged
merged 1 commit into from
Oct 8, 2024
Merged

Fix generating shims with duplicate names #1851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions crates/wit-component/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ serde_derive = { workspace = true }
serde_json = { workspace = true }

[dev-dependencies]
wasmprinter = { workspace = true }
wasmprinter = { workspace = true, features = ['component-model'] }
glob = "0.3.0"
pretty_assertions = "1.3.0"
env_logger = { workspace = true }
wat = { workspace = true }
wat = { workspace = true, features = ['component-model'] }
libtest-mimic = { workspace = true }

[target.'cfg(not(target_family = "wasm"))'.dev-dependencies]
Expand Down
7 changes: 6 additions & 1 deletion crates/wit-component/src/encoding.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1827,7 +1827,12 @@ impl<'a> Shims<'a> {
}

fn push(&mut self, shim: Shim<'a>) {
self.shims.insert(shim.kind.clone(), shim);
// Only one shim per `ShimKind` is retained, so if it's already present
// don't overwrite it. If it's not present though go ahead and insert
// it.
if !self.shims.contains_key(&shim.kind) {
self.shims.insert(shim.kind.clone(), shim);
}
}
}

Expand Down
63 changes: 40 additions & 23 deletions crates/wit-component/tests/components/merge-import-versions/component.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@
(export (;1;) "[method]r.x" (func (type 4)))
(type (;5;) (func (param "x" string)))
(export (;2;) "x" (func (type 5)))
(export (;3;) "x2" (func (type 5)))
(type (;6;) (func))
(export (;3;) "y" (func (type 6)))
(export (;4;) "y" (func (type 6)))
)
)
(import "a:b/c@0.1.1" (instance (;0;) (type 0)))
Expand All @@ -23,11 +24,13 @@
(import "a:b/c@0.1.0" "[constructor]r" (func (;0;) (type 0)))
(import "a:b/c@0.1.0" "[resource-drop]r" (func (;1;) (type 1)))
(import "a:b/c@0.1.0" "x" (func (;2;) (type 2)))
(import "a:b/c@0.1.1" "[constructor]r" (func (;3;) (type 0)))
(import "a:b/c@0.1.1" "[resource-drop]r" (func (;4;) (type 1)))
(import "a:b/c@0.1.1" "[method]r.x" (func (;5;) (type 1)))
(import "a:b/c@0.1.1" "x" (func (;6;) (type 2)))
(import "a:b/c@0.1.1" "y" (func (;7;) (type 3)))
(import "a:b/c@0.1.0" "x2" (func (;3;) (type 2)))
(import "a:b/c@0.1.1" "[constructor]r" (func (;4;) (type 0)))
(import "a:b/c@0.1.1" "[resource-drop]r" (func (;5;) (type 1)))
(import "a:b/c@0.1.1" "[method]r.x" (func (;6;) (type 1)))
(import "a:b/c@0.1.1" "x" (func (;7;) (type 2)))
(import "a:b/c@0.1.1" "x2" (func (;8;) (type 2)))
(import "a:b/c@0.1.1" "y" (func (;9;) (type 3)))
(memory (;0;) 1)
(export "memory" (memory 0))
(@producers
Expand All @@ -37,24 +40,32 @@
)
(core module (;1;)
(type (;0;) (func (param i32 i32)))
(table (;0;) 1 1 funcref)
(export "1" (func $indirect-a:b/c@0.1.1-x))
(table (;0;) 2 2 funcref)
(export "0" (func $indirect-a:b/c@0.1.0-x))
(export "1" (func $indirect-a:b/c@0.1.0-x2))
(export "$imports" (table 0))
(func $indirect-a:b/c@0.1.1-x (;0;) (type 0) (param i32 i32)
(func $indirect-a:b/c@0.1.0-x (;0;) (type 0) (param i32 i32)
local.get 0
local.get 1
i32.const 0
call_indirect (type 0)
)
(func $indirect-a:b/c@0.1.0-x2 (;1;) (type 0) (param i32 i32)
local.get 0
local.get 1
i32.const 1
call_indirect (type 0)
)
(@producers
(processed-by "wit-component" "$CARGO_PKG_VERSION")
)
)
(core module (;2;)
(type (;0;) (func (param i32 i32)))
(import "" "1" (func (;0;) (type 0)))
(import "" "$imports" (table (;0;) 1 1 funcref))
(elem (;0;) (i32.const 0) func 0)
(import "" "0" (func (;0;) (type 0)))
(import "" "1" (func (;1;) (type 0)))
(import "" "$imports" (table (;0;) 2 2 funcref))
(elem (;0;) (i32.const 0) func 0 1)
(@producers
(processed-by "wit-component" "$CARGO_PKG_VERSION")
)
Expand All @@ -64,26 +75,29 @@
(core func (;0;) (canon lower (func 0)))
(alias export 0 "r" (type (;1;)))
(core func (;1;) (canon resource.drop 1))
(alias core export 0 "1" (core func (;2;)))
(alias core export 0 "0" (core func (;2;)))
(alias core export 0 "1" (core func (;3;)))
(core instance (;1;)
(export "[constructor]r" (func 0))
(export "[resource-drop]r" (func 1))
(export "x" (func 2))
(export "x2" (func 3))
)
(alias export 0 "[constructor]r" (func (;1;)))
(core func (;3;) (canon lower (func 1)))
(core func (;4;) (canon lower (func 1)))
(alias export 0 "r" (type (;2;)))
(core func (;4;) (canon resource.drop 2))
(core func (;5;) (canon resource.drop 2))
(alias export 0 "[method]r.x" (func (;2;)))
(core func (;5;) (canon lower (func 2)))
(core func (;6;) (canon lower (func 2)))
(alias export 0 "y" (func (;3;)))
(core func (;6;) (canon lower (func 3)))
(core func (;7;) (canon lower (func 3)))
(core instance (;2;)
(export "[constructor]r" (func 3))
(export "[resource-drop]r" (func 4))
(export "[method]r.x" (func 5))
(export "[constructor]r" (func 4))
(export "[resource-drop]r" (func 5))
(export "[method]r.x" (func 6))
(export "x" (func 2))
(export "y" (func 6))
(export "x2" (func 3))
(export "y" (func 7))
)
(core instance (;3;) (instantiate 0
(with "a:b/c@0.1.0" (instance 1))
Expand All @@ -93,10 +107,13 @@
(alias core export 3 "memory" (core memory (;0;)))
(alias core export 0 "$imports" (core table (;0;)))
(alias export 0 "x" (func (;4;)))
(core func (;7;) (canon lower (func 4) (memory 0) string-encoding=utf8))
(core func (;8;) (canon lower (func 4) (memory 0) string-encoding=utf8))
(alias export 0 "x2" (func (;5;)))
(core func (;9;) (canon lower (func 5) (memory 0) string-encoding=utf8))
(core instance (;4;)
(export "$imports" (table 0))
(export "1" (func 7))
(export "0" (func 8))
(export "1" (func 9))
)
(core instance (;5;) (instantiate 2
(with "" (instance 4))
Expand Down
2 changes: 2 additions & 0 deletions crates/wit-component/tests/components/merge-import-versions/module.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@
(import "a:b/c@0.1.0" "[constructor]r" (func (result i32)))
(import "a:b/c@0.1.0" "[resource-drop]r" (func (param i32)))
(import "a:b/c@0.1.0" "x" (func (param i32 i32)))
(import "a:b/c@0.1.0" "x2" (func (param i32 i32)))

(import "a:b/c@0.1.1" "[constructor]r" (func (result i32)))
(import "a:b/c@0.1.1" "[resource-drop]r" (func (param i32)))
(import "a:b/c@0.1.1" "[method]r.x" (func (param i32)))
(import "a:b/c@0.1.1" "x" (func (param i32 i32)))
(import "a:b/c@0.1.1" "x2" (func (param i32 i32)))
(import "a:b/c@0.1.1" "y" (func))

(memory (export "memory") 1)
Expand Down
2 changes: 2 additions & 0 deletions crates/wit-component/tests/components/merge-import-versions/module.wit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@ package a:b@0.1.0 {
constructor();
}
x: func(x: string);
x2: func(x: string);
}
}

package a:b@0.1.1 {
interface c {
x: func(x: string);
x2: func(x: string);
y: func();

resource r {
Expand Down