Skip to content

Commit 40e5a44

Browse files
committed
Make wat test export memory as well
While it's a bit redundant to both import and export a memory, it's what WASI implementations expect. Emscripten, toywasm: Import alone is fine. But export wouldn't hurt. wasm-micro-runtime: Export is checked. Nothing actually seems to rely on it though. wasmtime: Export is necessary? References: https://github.com/WebAssembly/WASI/blob/main/legacy/application-abi.md#current-unstable-abi WebAssembly#22
1 parent 845ba39 commit 40e5a44

7 files changed

+7
-7
lines changed

test/testsuite/wasi_threads_exit_main_block.wat

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(module
2-
(memory (import "foo" "bar") 1 1 shared)
2+
(memory (export "memory") (import "foo" "bar") 1 1 shared)
33
(func $thread_spawn (import "wasi" "thread_spawn") (param i32) (result i32))
44
(func $proc_exit (import "wasi_snapshot_preview1" "proc_exit") (param i32))
55
(func (export "wasi_thread_start") (param i32 i32)

test/testsuite/wasi_threads_exit_main_busy.wat

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(module
2-
(memory (import "foo" "bar") 1 1 shared)
2+
(memory (export "memory") (import "foo" "bar") 1 1 shared)
33
(func $thread_spawn (import "wasi" "thread_spawn") (param i32) (result i32))
44
(func $proc_exit (import "wasi_snapshot_preview1" "proc_exit") (param i32))
55
(func (export "wasi_thread_start") (param i32 i32)

test/testsuite/wasi_threads_exit_main_wasi.wat

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(module
2-
(memory (import "foo" "bar") 1 1 shared)
2+
(memory (export "memory") (import "foo" "bar") 1 1 shared)
33
(func $thread_spawn (import "wasi" "thread_spawn") (param i32) (result i32))
44
(func $proc_exit (import "wasi_snapshot_preview1" "proc_exit") (param i32))
55
(func $poll_oneoff (import "wasi_snapshot_preview1" "poll_oneoff") (param i32 i32 i32 i32) (result i32))

test/testsuite/wasi_threads_exit_nonmain_block.wat

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(module
2-
(memory (import "foo" "bar") 1 1 shared)
2+
(memory (export "memory") (import "foo" "bar") 1 1 shared)
33
(func $thread_spawn (import "wasi" "thread_spawn") (param i32) (result i32))
44
(func $proc_exit (import "wasi_snapshot_preview1" "proc_exit") (param i32))
55
(func (export "wasi_thread_start") (param i32 i32)

test/testsuite/wasi_threads_exit_nonmain_busy.wat

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(module
2-
(memory (import "foo" "bar") 1 1 shared)
2+
(memory (export "memory") (import "foo" "bar") 1 1 shared)
33
(func $thread_spawn (import "wasi" "thread_spawn") (param i32) (result i32))
44
(func $proc_exit (import "wasi_snapshot_preview1" "proc_exit") (param i32))
55
(func (export "wasi_thread_start") (param i32 i32)

test/testsuite/wasi_threads_exit_nonmain_wasi.wat

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(module
2-
(memory (import "foo" "bar") 1 1 shared)
2+
(memory (export "memory") (import "foo" "bar") 1 1 shared)
33
(func $thread_spawn (import "wasi" "thread_spawn") (param i32) (result i32))
44
(func $proc_exit (import "wasi_snapshot_preview1" "proc_exit") (param i32))
55
(func $poll_oneoff (import "wasi_snapshot_preview1" "poll_oneoff") (param i32 i32 i32 i32) (result i32))

test/testsuite/wasi_threads_spawn.wat

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(module
2-
(memory (import "foo" "bar") 1 1 shared)
2+
(memory (export "memory") (import "foo" "bar") 1 1 shared)
33
(func $thread_spawn (import "wasi" "thread_spawn") (param i32) (result i32))
44
(func $proc_exit (import "wasi_snapshot_preview1" "proc_exit") (param i32))
55
(func (export "wasi_thread_start") (param i32 i32)

0 commit comments

Comments
 (0)