Skip to content

Make encodings in wit-component harder to get wrong #337

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

Merged
alexcrichton merged 1 commit into from
Oct 3, 2022
Merged

Make encodings in wit-component harder to get wrong #337

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
431 changes: 195 additions & 236 deletions crates/wit-component/src/encoding.rs
View file
Open in desktop

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions crates/wit-component/tests/components/exports/component.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,33 +67,33 @@
(alias core export 0 "memory" (core memory (;0;)))
(alias core export 0 "cabi_realloc" (core func (;0;)))
(alias core export 0 "a" (core func (;1;)))
(func (;0;) (type 0) (canon lift (core func 1)))
(export "a" (func 0))
(alias core export 0 "b" (core func (;2;)))
(alias core export 0 "cabi_post_b" (core func (;3;)))
(alias core export 0 "c" (core func (;4;)))
(func (;0;) (type 0) (canon lift (core func 1)))
(func (;1;) (type 1) (canon lift (core func 2) (memory 0) string-encoding=utf8 (post-return 3)))
(export "b" (func 1))
(alias core export 0 "c" (core func (;4;)))
(func (;2;) (type 3) (canon lift (core func 4) (memory 0)))
(export "c" (func 2))
(alias core export 0 "bar#a" (core func (;5;)))
(func (;3;) (type 5) (canon lift (core func 5)))
(instance (;0;)
(export "a" (func 3))
)
(export "bar" (instance 0))
(alias core export 0 "foo#a" (core func (;6;)))
(func (;4;) (type 0) (canon lift (core func 6)))
(alias core export 0 "foo#b" (core func (;7;)))
(alias core export 0 "cabi_post_foo#b" (core func (;8;)))
(func (;5;) (type 7) (canon lift (core func 7) (memory 0) (realloc 0) string-encoding=utf8 (post-return 8)))
(alias core export 0 "foo#c" (core func (;9;)))
(alias core export 0 "cabi_post_foo#c" (core func (;10;)))
(func (;4;) (type 0) (canon lift (core func 6)))
(func (;5;) (type 7) (canon lift (core func 7) (memory 0) (realloc 0) string-encoding=utf8 (post-return 8)))
(func (;6;) (type 8) (canon lift (core func 9) (memory 0) (realloc 0) string-encoding=utf8 (post-return 10)))
(instance (;0;)
(export "a" (func 3))
)
(instance (;1;)
(export "a" (func 4))
(export "b" (func 5))
(export "c" (func 6))
)
(export "a" (func 0))
(export "b" (func 1))
(export "c" (func 2))
(export "bar" (instance 0))
(export "foo" (instance 1))
)
8 changes: 4 additions & 4 deletions crates/wit-component/tests/components/import-conflict/component.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,15 @@
)
(core instance (;0;) (instantiate 1))
(alias core export 0 "0" (core func (;0;)))
(alias core export 0 "1" (core func (;1;)))
(alias export 2 "a" (func (;0;)))
(core func (;2;) (canon lower (func 0)))
(core instance (;1;)
(export "a" (func 0))
)
(alias core export 0 "1" (core func (;1;)))
(core instance (;2;)
(export "baz" (func 1))
)
(alias export 2 "a" (func (;0;)))
(core func (;2;) (canon lower (func 0)))
(core instance (;3;)
(export "a" (func 2))
)
Expand All @@ -93,8 +93,8 @@
(alias core export 4 "cabi_realloc" (core func (;3;)))
(alias core export 0 "$imports" (core table (;0;)))
(alias export 0 "a" (func (;1;)))
(alias export 1 "baz" (func (;2;)))
(core func (;4;) (canon lower (func 1) (memory 0) string-encoding=utf8))
(alias export 1 "baz" (func (;2;)))
(core func (;5;) (canon lower (func 2) (memory 0) (realloc 3)))
(core instance (;5;)
(export "$imports" (table 0))
Expand Down
4 changes: 2 additions & 2 deletions crates/wit-component/tests/components/import-export/component.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,15 @@
(alias core export 2 "a" (core func (;3;)))
(alias core export 2 "cabi_post_a" (core func (;4;)))
(func (;1;) (type 1) (canon lift (core func 3) (memory 0) (realloc 1) string-encoding=utf8 (post-return 4)))
(export "a" (func 1))
(alias core export 2 "bar#a" (core func (;5;)))
(func (;2;) (type 2) (canon lift (core func 5)))
(alias core export 2 "bar#b" (core func (;6;)))
(alias core export 2 "cabi_post_bar#b" (core func (;7;)))
(func (;2;) (type 2) (canon lift (core func 5)))
(func (;3;) (type 3) (canon lift (core func 6) (memory 0) string-encoding=utf8 (post-return 7)))
(instance (;1;)
(export "a" (func 2))
(export "b" (func 3))
)
(export "a" (func 1))
(export "bar" (instance 1))
)
24 changes: 12 additions & 12 deletions crates/wit-component/tests/components/imports/component.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,26 +91,26 @@
(alias core export 0 "0" (core func (;0;)))
(alias export 0 "bar2" (func (;0;)))
(core func (;1;) (canon lower (func 0)))
(alias core export 0 "1" (core func (;2;)))
(alias export 1 "baz2" (func (;1;)))
(alias export 1 "baz3" (func (;2;)))
(core func (;3;) (canon lower (func 1)))
(core func (;4;) (canon lower (func 2)))
(alias export 2 "foo1" (func (;3;)))
(alias export 2 "foo2" (func (;4;)))
(alias export 2 "foo3" (func (;5;)))
(core func (;5;) (canon lower (func 3)))
(core func (;6;) (canon lower (func 4)))
(core func (;7;) (canon lower (func 5)))
(core instance (;1;)
(export "bar1" (func 0))
(export "bar2" (func 1))
)
(alias core export 0 "1" (core func (;2;)))
(alias export 1 "baz2" (func (;1;)))
(core func (;3;) (canon lower (func 1)))
(alias export 1 "baz3" (func (;2;)))
(core func (;4;) (canon lower (func 2)))
(core instance (;2;)
(export "baz1" (func 2))
(export "baz2" (func 3))
(export "baz3" (func 4))
)
(alias export 2 "foo1" (func (;3;)))
(core func (;5;) (canon lower (func 3)))
(alias export 2 "foo2" (func (;4;)))
(core func (;6;) (canon lower (func 4)))
(alias export 2 "foo3" (func (;5;)))
(core func (;7;) (canon lower (func 5)))
(core instance (;3;)
(export "foo1" (func 5))
(export "foo2" (func 6))
Expand All @@ -126,8 +126,8 @@
(alias core export 4 "cabi_realloc" (core func (;8;)))
(alias core export 0 "$imports" (core table (;0;)))
(alias export 0 "bar1" (func (;6;)))
(alias export 1 "baz1" (func (;7;)))
(core func (;9;) (canon lower (func 6) (memory 0) string-encoding=utf8))
(alias export 1 "baz1" (func (;7;)))
(core func (;10;) (canon lower (func 7) (memory 0) string-encoding=utf8))
(core instance (;5;)
(export "$imports" (table 0))
Expand Down
60 changes: 30 additions & 30 deletions crates/wit-component/tests/components/lift-options/component.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,55 +127,55 @@
(alias core export 0 "memory" (core memory (;0;)))
(alias core export 0 "cabi_realloc" (core func (;0;)))
(alias core export 0 "a" (core func (;1;)))
(func (;0;) (type 0) (canon lift (core func 1)))
(export "a" (func 0))
(alias core export 0 "b" (core func (;2;)))
(func (;1;) (type 2) (canon lift (core func 2) (memory 0) (realloc 0) string-encoding=utf8))
(export "b" (func 1))
(alias core export 0 "c" (core func (;3;)))
(func (;2;) (type 4) (canon lift (core func 3) (memory 0) (realloc 0) string-encoding=utf8))
(export "c" (func 2))
(alias core export 0 "d" (core func (;4;)))
(func (;3;) (type 6) (canon lift (core func 4) (memory 0) (realloc 0) string-encoding=utf8))
(export "d" (func 3))
(alias core export 0 "e" (core func (;5;)))
(func (;4;) (type 8) (canon lift (core func 5)))
(export "e" (func 4))
(alias core export 0 "f" (core func (;6;)))
(func (;5;) (type 10) (canon lift (core func 6)))
(export "f" (func 5))
(alias core export 0 "g" (core func (;7;)))
(func (;6;) (type 12) (canon lift (core func 7) (memory 0) (realloc 0) string-encoding=utf8))
(export "g" (func 6))
(alias core export 0 "h" (core func (;8;)))
(func (;7;) (type 14) (canon lift (core func 8) (memory 0) (realloc 0) string-encoding=utf8))
(export "h" (func 7))
(alias core export 0 "i" (core func (;9;)))
(func (;8;) (type 16) (canon lift (core func 9) (memory 0) (realloc 0)))
(export "i" (func 8))
(alias core export 0 "j" (core func (;10;)))
(func (;9;) (type 17) (canon lift (core func 10)))
(export "j" (func 9))
(alias core export 0 "k" (core func (;11;)))
(func (;10;) (type 19) (canon lift (core func 11) (memory 0)))
(export "k" (func 10))
(alias core export 0 "l" (core func (;12;)))
(alias core export 0 "cabi_post_l" (core func (;13;)))
(func (;11;) (type 20) (canon lift (core func 12) (memory 0) string-encoding=utf8 (post-return 13)))
(export "l" (func 11))
(alias core export 0 "m" (core func (;14;)))
(alias core export 0 "cabi_post_m" (core func (;15;)))
(func (;12;) (type 21) (canon lift (core func 14) (memory 0) (post-return 15)))
(export "m" (func 12))
(alias core export 0 "n" (core func (;16;)))
(func (;13;) (type 22) (canon lift (core func 16)))
(export "n" (func 13))
(alias core export 0 "o" (core func (;17;)))
(alias core export 0 "cabi_post_o" (core func (;18;)))
(func (;14;) (type 23) (canon lift (core func 17) (memory 0) string-encoding=utf8 (post-return 18)))
(export "o" (func 14))
(alias core export 0 "p" (core func (;19;)))
(alias core export 0 "cabi_post_p" (core func (;20;)))
(func (;0;) (type 0) (canon lift (core func 1)))
(func (;1;) (type 2) (canon lift (core func 2) (memory 0) (realloc 0) string-encoding=utf8))
(func (;2;) (type 4) (canon lift (core func 3) (memory 0) (realloc 0) string-encoding=utf8))
(func (;3;) (type 6) (canon lift (core func 4) (memory 0) (realloc 0) string-encoding=utf8))
(func (;4;) (type 8) (canon lift (core func 5)))
(func (;5;) (type 10) (canon lift (core func 6)))
(func (;6;) (type 12) (canon lift (core func 7) (memory 0) (realloc 0) string-encoding=utf8))
(func (;7;) (type 14) (canon lift (core func 8) (memory 0) (realloc 0) string-encoding=utf8))
(func (;8;) (type 16) (canon lift (core func 9) (memory 0) (realloc 0)))
(func (;9;) (type 17) (canon lift (core func 10)))
(func (;10;) (type 19) (canon lift (core func 11) (memory 0)))
(func (;11;) (type 20) (canon lift (core func 12) (memory 0) string-encoding=utf8 (post-return 13)))
(func (;12;) (type 21) (canon lift (core func 14) (memory 0) (post-return 15)))
(func (;13;) (type 22) (canon lift (core func 16)))
(func (;14;) (type 23) (canon lift (core func 17) (memory 0) string-encoding=utf8 (post-return 18)))
(func (;15;) (type 25) (canon lift (core func 19) (memory 0) (post-return 20)))
(export "a" (func 0))
(export "b" (func 1))
(export "c" (func 2))
(export "d" (func 3))
(export "e" (func 4))
(export "f" (func 5))
(export "g" (func 6))
(export "h" (func 7))
(export "i" (func 8))
(export "j" (func 9))
(export "k" (func 10))
(export "l" (func 11))
(export "m" (func 12))
(export "n" (func 13))
(export "o" (func 14))
(export "p" (func 15))
)
28 changes: 14 additions & 14 deletions crates/wit-component/tests/components/lower-options/component.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,14 +203,14 @@
(alias core export 0 "9" (core func (;9;)))
(alias core export 0 "10" (core func (;10;)))
(alias export 0 "a" (func (;0;)))
(alias export 0 "e" (func (;1;)))
(alias export 0 "f" (func (;2;)))
(alias export 0 "j" (func (;3;)))
(alias export 0 "n" (func (;4;)))
(core func (;11;) (canon lower (func 0)))
(alias export 0 "e" (func (;1;)))
(core func (;12;) (canon lower (func 1)))
(alias export 0 "f" (func (;2;)))
(core func (;13;) (canon lower (func 2)))
(alias export 0 "j" (func (;3;)))
(core func (;14;) (canon lower (func 3)))
(alias export 0 "n" (func (;4;)))
(core func (;15;) (canon lower (func 4)))
(core instance (;1;)
(export "b" (func 0))
Expand Down Expand Up @@ -238,26 +238,26 @@
(alias core export 2 "cabi_realloc" (core func (;16;)))
(alias core export 0 "$imports" (core table (;0;)))
(alias export 0 "b" (func (;5;)))
(alias export 0 "c" (func (;6;)))
(alias export 0 "d" (func (;7;)))
(alias export 0 "g" (func (;8;)))
(alias export 0 "h" (func (;9;)))
(alias export 0 "i" (func (;10;)))
(alias export 0 "k" (func (;11;)))
(alias export 0 "l" (func (;12;)))
(alias export 0 "m" (func (;13;)))
(alias export 0 "o" (func (;14;)))
(alias export 0 "p" (func (;15;)))
(core func (;17;) (canon lower (func 5) (memory 0) string-encoding=utf8))
(alias export 0 "c" (func (;6;)))
(core func (;18;) (canon lower (func 6) (memory 0) string-encoding=utf8))
(alias export 0 "d" (func (;7;)))
(core func (;19;) (canon lower (func 7) (memory 0) string-encoding=utf8))
(alias export 0 "g" (func (;8;)))
(core func (;20;) (canon lower (func 8) (memory 0) string-encoding=utf8))
(alias export 0 "h" (func (;9;)))
(core func (;21;) (canon lower (func 9) (memory 0) string-encoding=utf8))
(alias export 0 "i" (func (;10;)))
(core func (;22;) (canon lower (func 10) (memory 0)))
(alias export 0 "k" (func (;11;)))
(core func (;23;) (canon lower (func 11) (memory 0)))
(alias export 0 "l" (func (;12;)))
(core func (;24;) (canon lower (func 12) (memory 0) (realloc 16) string-encoding=utf8))
(alias export 0 "m" (func (;13;)))
(core func (;25;) (canon lower (func 13) (memory 0) (realloc 16)))
(alias export 0 "o" (func (;14;)))
(core func (;26;) (canon lower (func 14) (memory 0) (realloc 16) string-encoding=utf8))
(alias export 0 "p" (func (;15;)))
(core func (;27;) (canon lower (func 15) (memory 0) (realloc 16)))
(core instance (;3;)
(export "$imports" (table 0))
Expand Down
12 changes: 6 additions & 6 deletions crates/wit-component/tests/components/simple/component.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,17 @@
(alias core export 0 "memory" (core memory (;0;)))
(alias core export 0 "cabi_realloc" (core func (;0;)))
(alias core export 0 "a" (core func (;1;)))
(func (;0;) (type 0) (canon lift (core func 1)))
(export "a" (func 0))
(alias core export 0 "b" (core func (;2;)))
(alias core export 0 "cabi_post_b" (core func (;3;)))
(func (;1;) (type 1) (canon lift (core func 2) (memory 0) string-encoding=utf8 (post-return 3)))
(export "b" (func 1))
(alias core export 0 "c" (core func (;4;)))
(alias core export 0 "cabi_post_c" (core func (;5;)))
(alias core export 0 "d" (core func (;6;)))
(func (;0;) (type 0) (canon lift (core func 1)))
(func (;1;) (type 1) (canon lift (core func 2) (memory 0) string-encoding=utf8 (post-return 3)))
(func (;2;) (type 2) (canon lift (core func 4) (memory 0) (realloc 0) string-encoding=utf8 (post-return 5)))
(func (;3;) (type 4) (canon lift (core func 6) (memory 0) (realloc 0) string-encoding=utf8))
(export "a" (func 0))
(export "b" (func 1))
(export "c" (func 2))
(alias core export 0 "d" (core func (;6;)))
(func (;3;) (type 4) (canon lift (core func 6) (memory 0) (realloc 0) string-encoding=utf8))
(export "d" (func 3))
)