fix misc_testsuite test regressions

dicej · dicej · commit 1dfed8a58b7a · 2025-11-18T12:18:52.000-07:00
This amounts to adding `async` to any exported component functions that might
need to block.

Signed-off-by: Joel Dice &lt;joel.dice@fermyon.com&gt;
diff --git a/tests/misc_testsuite/component-model-threading/many-threads-indexed.wast b/tests/misc_testsuite/component-model-threading/many-threads-indexed.wast
@@ -121,6 +121,6 @@
             (with "libc" (instance $libc))))
 
     ;; Export the main entry point
-    (func (export "run") (result u32) (canon lift (core func $i "run"))))
+    (func (export "run") async (result u32) (canon lift (core func $i "run"))))
 
 (assert_return (invoke "run") (u32.const 42))
diff --git a/tests/misc_testsuite/component-model-threading/stackful-cancellation.wast b/tests/misc_testsuite/component-model-threading/stackful-cancellation.wast
@@ -223,17 +223,17 @@
                 (with "libc" (instance $libc))))
 
         (func (export "run-yield") (result u32) (canon lift (core func $cm "run-yield") async))
-        (func (export "run-yield-to") (param "fut" $FT) (result u32) (canon lift (core func $cm "run-yield-to") async))
-        (func (export "run-suspend") (param "fut" $FT) (result u32) (canon lift (core func $cm "run-suspend") async))
-        (func (export "run-switch-to") (param "fut" $FT) (result u32) (canon lift (core func $cm "run-switch-to") async))
+        (func (export "run-yield-to") async (param "fut" $FT) (result u32) (canon lift (core func $cm "run-yield-to") async))
+        (func (export "run-suspend") async (param "fut" $FT) (result u32) (canon lift (core func $cm "run-suspend") async))
+        (func (export "run-switch-to") async (param "fut" $FT) (result u32) (canon lift (core func $cm "run-switch-to") async))
     )
 
     (component $D
         (type $FT (future))
         (import "run-yield" (func $run-yield (result u32)))
-        (import "run-yield-to" (func $run-yield-to (param "fut" $FT) (result u32)))
-        (import "run-suspend" (func $run-suspend (param "fut" $FT) (result u32)))
-        (import "run-switch-to" (func $run-switch-to (param "fut" $FT) (result u32)))
+        (import "run-yield-to" (func $run-yield-to async (param "fut" $FT) (result u32)))
+        (import "run-suspend" (func $run-suspend async (param "fut" $FT) (result u32)))
+        (import "run-switch-to" (func $run-switch-to async (param "fut" $FT) (result u32)))
 
         (core module $Memory (memory (export "mem") 1))
         (core instance $memory (instantiate $Memory))
@@ -369,7 +369,7 @@
             (export "future.write" (func $future.write))
             (export "thread.yield" (func $thread.yield))
         ))))
-        (func (export "run") (result u32) (canon lift (core func $dm "run")))
+        (func (export "run") async (result u32) (canon lift (core func $dm "run")))
     )
 
     (instance $c (instantiate $C))
diff --git a/tests/misc_testsuite/component-model-threading/threading-builtins.wast b/tests/misc_testsuite/component-model-threading/threading-builtins.wast
@@ -97,6 +97,6 @@
             (with "libc" (instance $libc))))
 
     ;; Export the main entry point
-    (func (export "run") (result u32) (canon lift (core func $i "run"))))
+    (func (export "run") async (result u32) (canon lift (core func $i "run"))))
 
 (assert_return (invoke "run") (u32.const 42))
diff --git a/tests/misc_testsuite/component-model/async/backpressure-deadlock.wast b/tests/misc_testsuite/component-model/async/backpressure-deadlock.wast
@@ -91,7 +91,7 @@
     ))
   ))
 
-  (func (export "f") (canon lift (core func $i "f")))
+  (func (export "f") async (canon lift (core func $i "f")))
 )
 
 (assert_trap (invoke "f") "deadlock detected")
diff --git a/tests/misc_testsuite/component-model/async/future-cancel-read-dropped.wast b/tests/misc_testsuite/component-model/async/future-cancel-read-dropped.wast
@@ -58,7 +58,7 @@
     ))
   ))
 
-  (func (export "f") (result u32) (canon lift (core func $i "f")))
+  (func (export "f") async (result u32) (canon lift (core func $i "f")))
 )
 
 ;; Note that there's no way for `future.read` to return DROPPED since the write
diff --git a/tests/misc_testsuite/component-model/async/future-cancel-write-completed.wast b/tests/misc_testsuite/component-model/async/future-cancel-write-completed.wast
@@ -90,7 +90,7 @@
     ))
   ))
 
-  (func (export "f") (result u32) (canon lift (core func $i "f")))
+  (func (export "f") async (result u32) (canon lift (core func $i "f")))
 )
 
 (assert_return (invoke "f") (u32.const 0))
diff --git a/tests/misc_testsuite/component-model/async/future-cancel-write-dropped.wast b/tests/misc_testsuite/component-model/async/future-cancel-write-dropped.wast
@@ -51,7 +51,7 @@
     ))
   ))
 
-  (func (export "f") (result u32) (canon lift (core func $i "f")))
+  (func (export "f") async (result u32) (canon lift (core func $i "f")))
 )
 
 (assert_return (invoke "f") (u32.const 1)) ;; expect DROPPED status (not CANCELLED)
diff --git a/tests/misc_testsuite/component-model/async/future-read.wast b/tests/misc_testsuite/component-model/async/future-read.wast
@@ -49,7 +49,7 @@
     ))
   ))
 
-  (func (export "run")
+  (func (export "run") async
     (canon lift (core func $i "run")))
 )
 
@@ -134,7 +134,7 @@
         (export "read" (func $read))
       ))
     ))
-    (func (export "run") (param "x" $future)
+    (func (export "run") async (param "x" $future)
       (canon lift (core func $i "run") async (callback (func $i "cb"))))
   )
   (instance $child (instantiate $child))
@@ -158,7 +158,7 @@
     ))
   ))
 
-  (func (export "run")
+  (func (export "run") async
     (canon lift (core func $i "run")))
 )
 
@@ -219,7 +219,7 @@
     ))
   ))
 
-  (func (export "run")
+  (func (export "run") async
     (canon lift (core func $i "run")))
 )
 
diff --git a/tests/misc_testsuite/component-model/async/partial-stream-copies.wast b/tests/misc_testsuite/component-model/async/partial-stream-copies.wast
@@ -234,7 +234,7 @@
       (export "stream.drop-writable" (func $stream.drop-writable))
       (export "transform" (func $transform'))
     ))))
-    (func (export "run") (result u32) (canon lift (core func $dm "run")))
+    (func (export "run") async (result u32) (canon lift (core func $dm "run")))
   )
 
   (instance $c (instantiate $C))
diff --git a/tests/misc_testsuite/component-model/async/subtask-wait.wast b/tests/misc_testsuite/component-model/async/subtask-wait.wast
@@ -17,11 +17,11 @@
     )
 
     (core instance $a (instantiate $a))
-    (func (export "run")
+    (func (export "run") async
       (canon lift (core func $a "run") async (callback (func $a "run-cb"))))
   )
   (component $B
-    (import "a" (instance $a (export "run" (func))))
+    (import "a" (instance $a (export "run" (func async))))
 
     (core module $libc (memory (export "memory") 1))
     (core instance $libc (instantiate $libc))
@@ -71,7 +71,7 @@
         (export "wait" (func $wait))
       ))
     ))
-    (func (export "run")
+    (func (export "run") async
       (canon lift (core func $b "run")))
   )
 
diff --git a/tests/misc_testsuite/component-model/async/trap-if-done.wast b/tests/misc_testsuite/component-model/async/trap-if-done.wast
@@ -423,14 +423,14 @@
       (export "stream-drop-writable" (func $stream-drop-writable'))
     ))))
     (func (export "trap-after-future-eager-write") (canon lift (core func $core "trap-after-future-eager-write")))
-    (func (export "trap-after-future-async-write") (canon lift (core func $core "trap-after-future-async-write")))
+    (func (export "trap-after-future-async-write") async (canon lift (core func $core "trap-after-future-async-write")))
     (func (export "trap-after-future-reader-dropped") (canon lift (core func $core "trap-after-future-reader-dropped")))
     (func (export "trap-after-future-eager-read") (param "bool" bool) (result $FT) (canon lift (core func $core "trap-after-future-eager-read")))
-    (func (export "trap-after-future-async-read") (param "bool" bool) (result $FT) (canon lift (core func $core "trap-after-future-async-read")))
+    (func (export "trap-after-future-async-read") async (param "bool" bool) (result $FT) (canon lift (core func $core "trap-after-future-async-read")))
     (func (export "trap-after-stream-reader-eager-dropped") (canon lift (core func $core "trap-after-stream-reader-eager-dropped")))
-    (func (export "trap-after-stream-reader-async-dropped") (canon lift (core func $core "trap-after-stream-reader-async-dropped")))
+    (func (export "trap-after-stream-reader-async-dropped") async (canon lift (core func $core "trap-after-stream-reader-async-dropped")))
     (func (export "trap-after-stream-writer-eager-dropped") (param "bool" bool) (result $ST) (canon lift (core func $core "trap-after-stream-writer-eager-dropped")))
-    (func (export "trap-after-stream-writer-async-dropped") (param "bool" bool) (result $ST) (canon lift (core func $core "trap-after-stream-writer-async-dropped")))
+    (func (export "trap-after-stream-writer-async-dropped") async (param "bool" bool) (result $ST) (canon lift (core func $core "trap-after-stream-writer-async-dropped")))
   )
   (instance $c (instantiate $C))
   (instance $d (instantiate $D (with "c" (instance $c))))
diff --git a/tests/misc_testsuite/component-model/async/wait-forever.wast b/tests/misc_testsuite/component-model/async/wait-forever.wast
@@ -30,7 +30,7 @@
       ))
     ))
 
-    (func (export "run")
+    (func (export "run") async
       (canon lift (core func $i "run") async (callback (func $i "cb"))))
   )
   (instance $child (instantiate $child))
@@ -49,7 +49,7 @@
     ))
   ))
 
-  (func (export "run")
+  (func (export "run") async
     (canon lift (core func $i "run")))
 )
 
diff --git a/tests/misc_testsuite/component-model/async/wait-forever2.wast b/tests/misc_testsuite/component-model/async/wait-forever2.wast
@@ -26,14 +26,14 @@
       (export "mem" (memory $memory "mem"))
       (export "waitable-set.new" (func $waitable-set.new))
     ))))
-    (func (export "f") (result u32) (canon lift
+    (func (export "f") async (result u32) (canon lift
       (core func $cm "f")
       async (memory $memory "mem") (callback (func $cm "cb"))
     ))
   )
 
   (component $D
-    (import "f" (func $f (result u32)))
+    (import "f" (func $f async (result u32)))
 
     (core module $Memory (memory (export "mem") 1))
     (core instance $memory (instantiate $Memory))
@@ -65,7 +65,7 @@
       (export "waitable-set.wait" (func $waitable-set.wait))
       (export "f" (func $f'))
     ))))
-    (func (export "f") (result u32) (canon lift (core func $dm "g")))
+    (func (export "f") async (result u32) (canon lift (core func $dm "g")))
   )
 
   (instance $c (instantiate $C))

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@`
`91`	`91`	`))`
`92`	`92`	`))`
`93`	`93`
`94`		`- (func (export "f") (canon lift (core func $i "f")))`
	`94`	`+ (func (export "f") async (canon lift (core func $i "f")))`
`95`	`95`	`)`
`96`	`96`
`97`	`97`	`(assert_trap (invoke "f") "deadlock detected")`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@`
`58`	`58`	`))`
`59`	`59`	`))`
`60`	`60`
`61`		`- (func (export "f") (result u32) (canon lift (core func $i "f")))`
	`61`	`+ (func (export "f") async (result u32) (canon lift (core func $i "f")))`
`62`	`62`	`)`
`63`	`63`
`64`	`64`	;; Note that there's no way for `future.read` to return DROPPED since the write
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@`
`90`	`90`	`))`
`91`	`91`	`))`
`92`	`92`
`93`		`- (func (export "f") (result u32) (canon lift (core func $i "f")))`
	`93`	`+ (func (export "f") async (result u32) (canon lift (core func $i "f")))`
`94`	`94`	`)`
`95`	`95`
`96`	`96`	`(assert_return (invoke "f") (u32.const 0))`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@`
`51`	`51`	`))`
`52`	`52`	`))`
`53`	`53`
`54`		`- (func (export "f") (result u32) (canon lift (core func $i "f")))`
	`54`	`+ (func (export "f") async (result u32) (canon lift (core func $i "f")))`
`55`	`55`	`)`
`56`	`56`
`57`	`57`	`(assert_return (invoke "f") (u32.const 1)) ;; expect DROPPED status (not CANCELLED)`
Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@`
`234`	`234`	`(export "stream.drop-writable" (func $stream.drop-writable))`
`235`	`235`	`(export "transform" (func $transform'))`
`236`	`236`	`))))`
`237`		`- (func (export "run") (result u32) (canon lift (core func $dm "run")))`
	`237`	`+ (func (export "run") async (result u32) (canon lift (core func $dm "run")))`
`238`	`238`	`)`
`239`	`239`
`240`	`240`	`(instance $c (instantiate $C))`
Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,11 @@`
`17`	`17`	`)`
`18`	`18`
`19`	`19`	`(core instance $a (instantiate $a))`
`20`		`- (func (export "run")`
	`20`	`+ (func (export "run") async`
`21`	`21`	`(canon lift (core func $a "run") async (callback (func $a "run-cb"))))`
`22`	`22`	`)`
`23`	`23`	`(component $B`
`24`		`- (import "a" (instance $a (export "run" (func))))`
	`24`	`+ (import "a" (instance $a (export "run" (func async))))`
`25`	`25`
`26`	`26`	`(core module $libc (memory (export "memory") 1))`
`27`	`27`	`(core instance $libc (instantiate $libc))`
`@@ -71,7 +71,7 @@`
`71`	`71`	`(export "wait" (func $wait))`
`72`	`72`	`))`
`73`	`73`	`))`
`74`		`- (func (export "run")`
	`74`	`+ (func (export "run") async`
`75`	`75`	`(canon lift (core func $b "run")))`
`76`	`76`	`)`
`77`	`77`