Update existing WASTs to follow adhere to #655

Author: lukewagner

test/README.md

@@ -6,16 +6,16 @@ This directory contains Component Model reference tests, grouped by functionalit
 
 A single `.wast` test can be run with full backtrace on trap via:
 ```
-WASMTIME_BACKTRACE_DETAILS=1 wasmtime wast -W component-model-more-async-builtins -W component-model-threading -W component-model-async-stackful -W component-model-implements the-test.wast
+WASMTIME_BACKTRACE_DETAILS=1 WAST_STRICT_COMPONENT_INDICES=1 wasmtime wast -W component-model-more-async-builtins -W component-model-threading -W component-model-async-stackful -W component-model-implements the-test.wast
 ```
 
 All the tests can be run from this directory via:
 ```
-find . -name "*.wast" | xargs wasmtime wast -W component-model-more-async-builtins -W component-model-threading -W component-model-async-stackful -W component-model-implements
+find . -name "*.wast" | WAST_STRICT_COMPONENT_INDICES=1 xargs wasmtime wast -W component-model-more-async-builtins -W component-model-threading -W component-model-async-stackful -W component-model-implements
 ```
 
 Sometimes tests are landed ahead of the implementation and fail for a while.
 These tests are listed in 'nyi.txt' and can be filtered out via:
 ```
-find . -name "*.wast" | grep -vxFf nyi.txt | xargs wasmtime wast -W component-model-more-async-builtins -W component-model-threading -W component-model-async-stackful -W component-model-implements
+find . -name "*.wast" | grep -vxFf nyi.txt | WAST_STRICT_COMPONENT_INDICES=1 xargs wasmtime wast -W component-model-more-async-builtins -W component-model-threading -W component-model-async-stackful -W component-model-implements
 ```

test/async/async-calls-sync.wast

@@ -55,11 +55,11 @@
     ))))
     (func (export "blocking-call") async (result u32) (canon lift
       (core func $core_async_inner "blocking-call")
-      async (callback (func $core_async_inner "blocking-call-cb"))
+      async (callback (core func $core_async_inner "blocking-call-cb"))
     ))
     (func (export "unblock") async (canon lift
       (core func $core_async_inner "unblock")
-      async (callback (func $core_async_inner "unblock-cb"))
+      async (callback (core func $core_async_inner "unblock-cb"))
     ))
   )
 
@@ -101,7 +101,7 @@
     ))))
     (func (export "sync-func") async (result u32) (canon lift
       (core func $core_sync_middle "sync-func")
-      async (callback (func $core_sync_middle "sync-func-cb"))
+      async (callback (core func $core_sync_middle "sync-func-cb"))
     ))
   )
 
@@ -199,8 +199,8 @@
     (canon waitable.join (core func $waitable.join))
     (canon waitable-set.new (core func $waitable-set.new))
     (canon lower (func $unblock) (core func $unblock))
-    (canon lower (func $sync-func1) async (memory $memory "mem") (core func $sync-func1'))
-    (canon lower (func $sync-func2) async (memory $memory "mem") (core func $sync-func2'))
+    (canon lower (func $sync-func1) async (memory (core memory $memory "mem")) (core func $sync-func1'))
+    (canon lower (func $sync-func2) async (memory (core memory $memory "mem")) (core func $sync-func2'))
     (core instance $em (instantiate $CoreAsyncOuter (with "" (instance
       (export "mem" (memory $memory "mem"))
       (export "task.return" (func $task.return))
@@ -213,7 +213,7 @@
     ))))
     (func (export "run") async (result u32) (canon lift
       (core func $em "run")
-      async (callback (func $em "run-cb"))
+      async (callback (core func $em "run-cb"))
     ))
   )
 

test/async/big-interleaving-test.wast

@@ -111,9 +111,9 @@
     (canon waitable.join (core func $waitable.join))
     (canon waitable-set.new (core func $waitable-set.new))
     (canon waitable-set.drop (core func $waitable-set.drop))
-    (canon stream.read $ST async (memory $memory "mem") (core func $stream.read))
+    (canon stream.read $ST async (memory (core memory $memory "mem")) (core func $stream.read))
     (canon stream.drop-readable $ST (core func $stream.drop-readable))
-    (canon future.read $FT async (memory $memory "mem") (core func $future.read))
+    (canon future.read $FT async (memory (core memory $memory "mem")) (core func $future.read))
     (canon future.drop-readable $FT (core func $future.drop-readable))
     (core instance $mm (instantiate $MM (with "" (instance
       (export "mem" (memory $memory "mem"))
@@ -131,13 +131,13 @@
       (export "future.read" (func $future.read))
       (export "future.drop-readable" (func $future.drop-readable))))))
     (func (export "sink") async (param "in" (stream u8)) (canon lift
-      (core func $mm "sink") async (memory $memory "mem") (callback (func $mm "sink_cb"))))
+      (core func $mm "sink") async (memory (core memory $memory "mem")) (callback (core func $mm "sink_cb"))))
     (func (export "sink-future") async (param "in" (future u8)) (canon lift
-      (core func $mm "sink-future") async (memory $memory "mem") (callback (func $mm "sink-future_cb"))))
+      (core func $mm "sink-future") async (memory (core memory $memory "mem")) (callback (core func $mm "sink-future_cb"))))
     (func (export "block-empty") async (canon lift
-      (core func $mm "block-empty") async (memory $memory "mem") (callback (func $mm "block-empty_cb"))))
+      (core func $mm "block-empty") async (memory (core memory $memory "mem")) (callback (core func $mm "block-empty_cb"))))
     (func (export "block-future") async (param "in" (future u8)) (canon lift
-      (core func $mm "block-future") async (memory $memory "mem") (callback (func $mm "block-future_cb"))))
+      (core func $mm "block-future") async (memory (core memory $memory "mem")) (callback (core func $mm "block-future_cb"))))
     (func (export "bp-inc") (canon lift (core func $mm "bp-inc")))
     (func (export "bp-dec") (canon lift (core func $mm "bp-dec")))
   )
@@ -342,31 +342,31 @@
     (type $ST (stream u8))
     (type $FT (future u8))
     (canon stream.new $ST (core func $stream.new))
-    (canon stream.read $ST async (memory $memory "mem") (core func $stream.read))
-    (canon stream.write $ST async (memory $memory "mem") (core func $stream.write))
+    (canon stream.read $ST async (memory (core memory $memory "mem")) (core func $stream.read))
+    (canon stream.write $ST async (memory (core memory $memory "mem")) (core func $stream.write))
     (canon stream.cancel-read $ST async (core func $stream.cancel-read))
     (canon stream.cancel-write $ST async (core func $stream.cancel-write))
     (canon stream.drop-readable $ST (core func $stream.drop-readable))
     (canon stream.drop-writable $ST (core func $stream.drop-writable))
     (canon future.new $FT (core func $future.new))
-    (canon future.read $FT async (memory $memory "mem") (core func $future.read))
-    (canon future.write $FT async (memory $memory "mem") (core func $future.write))
+    (canon future.read $FT async (memory (core memory $memory "mem")) (core func $future.read))
+    (canon future.write $FT async (memory (core memory $memory "mem")) (core func $future.write))
     (canon future.cancel-read $FT async (core func $future.cancel-read))
     (canon future.cancel-write $FT async (core func $future.cancel-write))
     (canon future.drop-readable $FT (core func $future.drop-readable))
     (canon future.drop-writable $FT (core func $future.drop-writable))
     (canon task.return (core func $task.return))
     (canon waitable.join (core func $waitable.join))
     (canon waitable-set.new (core func $waitable-set.new))
-    (canon waitable-set.poll (memory $memory "mem") (core func $waitable-set.poll))
-    (canon waitable-set.wait (memory $memory "mem") (core func $waitable-set.wait))
+    (canon waitable-set.poll (memory (core memory $memory "mem")) (core func $waitable-set.poll))
+    (canon waitable-set.wait (memory (core memory $memory "mem")) (core func $waitable-set.wait))
     (canon waitable-set.drop (core func $waitable-set.drop))
     (canon subtask.cancel async (core func $subtask.cancel))
     (canon subtask.drop (core func $subtask.drop))
-    (canon lower (func $sink) async (memory $memory "mem") (core func $sink'))
-    (canon lower (func $sink-future) async (memory $memory "mem") (core func $sink-future'))
-    (canon lower (func $block-empty) async (memory $memory "mem") (core func $block-empty'))
-    (canon lower (func $block-future) async (memory $memory "mem") (core func $block-future'))
+    (canon lower (func $sink) async (memory (core memory $memory "mem")) (core func $sink'))
+    (canon lower (func $sink-future) async (memory (core memory $memory "mem")) (core func $sink-future'))
+    (canon lower (func $block-empty) async (memory (core memory $memory "mem")) (core func $block-empty'))
+    (canon lower (func $block-future) async (memory (core memory $memory "mem")) (core func $block-future'))
     (canon lower (func $bp-inc) (core func $bp-inc'))
     (canon lower (func $bp-dec) (core func $bp-dec'))
     (core instance $tm (instantiate $TM (with "" (instance
@@ -401,7 +401,7 @@
       (export "waitable-set.drop" (func $waitable-set.drop))))))
     (func (export "poll-readable") (param "slot" u8) (param "event" u8) (param "payload" u32) (canon lift (core func $tm "poll-readable")))
     (func (export "await-readable") async (param "slot" u8) (param "event" u8) (param "payload" u32) (canon lift
-      (core func $tm "await-readable") async (memory $memory "mem")))
+      (core func $tm "await-readable") async (memory (core memory $memory "mem"))))
     (func (export "call-import") (param "slot" u8) (result s32) (canon lift (core func $tm "call-import")))
     (func (export "call-import-future") (param "slot" u8) (result s32) (canon lift (core func $tm "call-import-future")))
     (func (export "call-block-empty") (param "sub" u8) (result s32) (canon lift (core func $tm "call-block-empty")))
@@ -411,7 +411,7 @@
     (func (export "mock-bp-inc") (canon lift (core func $tm "mock-bp-inc")))
     (func (export "mock-bp-dec") (canon lift (core func $tm "mock-bp-dec")))
     (func (export "await-subtask") async (param "sub" u8) (param "state" u8) (canon lift
-      (core func $tm "await-subtask") async (memory $memory "mem")))
+      (core func $tm "await-subtask") async (memory (core memory $memory "mem"))))
     (func (export "stream-new") (param "slot" u8) (canon lift (core func $tm "stream-new")))
     (func (export "testee-write") (param "handle" u8) (param "bytes" u32) (result s32) (canon lift (core func $tm "testee-write")))
     (func (export "testee-read") (param "handle" u8) (param "bytes" u32) (result s32) (canon lift (core func $tm "testee-read")))
@@ -428,7 +428,7 @@
     (func (export "drop-writable") (param "slot" u8) (canon lift (core func $tm "drop-writable")))
     (func (export "poll") (param "slot" u8) (param "event" u8) (param "payload" u32) (canon lift (core func $tm "poll")))
     (func (export "await") async (param "slot" u8) (param "event" u8) (param "payload" u32) (canon lift
-      (core func $tm "await") async (memory $memory "mem")))
+      (core func $tm "await") async (memory (core memory $memory "mem"))))
   )
 
   (component $Driver
@@ -770,7 +770,7 @@
       (export "mock-bp-inc" (func $mock-bp-inc'))
       (export "mock-bp-dec" (func $mock-bp-dec'))))))
     (func (export "run") (param "prog" (list $command-e))
-      (canon lift (core func $dm "run") (memory $dm "mem") (realloc (func $dm "realloc")))))
+      (canon lift (core func $dm "run") (memory (core memory $dm "mem")) (realloc (core func $dm "realloc")))))
 
   (instance $mock (instantiate $Mock))
   (instance $testee (instantiate $Testee

test/async/builtin-trap-poisons-instance.wast

@@ -25,7 +25,7 @@
   )
   (type $ST (stream u8))
   (canon stream.new $ST (core func $stream.new))
-  (canon stream.write $ST async (memory $memory "mem") (core func $stream.write))
+  (canon stream.write $ST async (memory (core memory $memory "mem")) (core func $stream.write))
   (canon stream.drop-writable $ST (core func $stream.drop-writable))
   (core instance $m (instantiate $M (with "" (instance
     (export "mem" (memory $memory "mem"))

test/async/cancel-stream.wast

@@ -70,7 +70,7 @@
     (type $ST (stream u8))
     (canon task.return (result u32) (core func $task.return))
     (canon stream.new $ST (core func $stream.new))
-    (canon stream.write $ST async (memory $memory "mem") (core func $stream.write))
+    (canon stream.write $ST async (memory (core memory $memory "mem")) (core func $stream.write))
     (canon stream.cancel-write $ST (core func $stream.cancel-write))
     (canon stream.drop-writable $ST (core func $stream.drop-writable))
     (core instance $cm (instantiate $CM (with "" (instance
@@ -173,7 +173,7 @@
       )
     )
     (type $ST (stream u8))
-    (canon stream.read $ST async (memory $memory "mem") (core func $stream.read))
+    (canon stream.read $ST async (memory (core memory $memory "mem")) (core func $stream.read))
     (canon stream.cancel-read $ST (core func $stream.cancel-read))
     (canon stream.drop-readable $ST (core func $stream.drop-readable))
     (canon lower (func $c "start-stream") (core func $start-stream'))

test/async/cancel-subtask.wast

@@ -58,10 +58,10 @@
     )
     (type $FT (future))
     (canon task.cancel (core func $task.cancel))
-    (canon future.read $FT async (memory $memory "mem") (core func $future.read))
+    (canon future.read $FT async (memory (core memory $memory "mem")) (core func $future.read))
     (canon waitable.join (core func $waitable.join))
     (canon waitable-set.new (core func $waitable-set.new))
-    (canon waitable-set.wait (memory $memory "mem") (core func $waitable-set.wait))
+    (canon waitable-set.wait (memory (core memory $memory "mem")) (core func $waitable-set.wait))
     (core instance $cm (instantiate $CM (with "" (instance
       (export "mem" (memory $memory "mem"))
       (export "task.cancel" (func $task.cancel))
@@ -72,7 +72,7 @@
     ))))
     (func (export "f") async (result u32) (canon lift
       (core func $cm "f")
-      async (callback (func $cm "f_cb"))
+      async (callback (core func $cm "f_cb"))
     ))
     (func (export "g") async (param "fut" $FT) (result u32) (canon lift
       (core func $cm "g")
@@ -170,12 +170,12 @@
     (canon subtask.cancel async (core func $subtask.cancel))
     (canon subtask.drop (core func $subtask.drop))
     (canon future.new $FT (core func $future.new))
-    (canon future.write $FT async (memory $memory "mem") (core func $future.write))
+    (canon future.write $FT async (memory (core memory $memory "mem")) (core func $future.write))
     (canon waitable.join (core func $waitable.join))
     (canon waitable-set.new (core func $waitable-set.new))
-    (canon waitable-set.wait (memory $memory "mem") (core func $waitable-set.wait))
-    (canon lower (func $f) async (memory $memory "mem") (core func $f'))
-    (canon lower (func $g) async (memory $memory "mem") (core func $g'))
+    (canon waitable-set.wait (memory (core memory $memory "mem")) (core func $waitable-set.wait))
+    (canon lower (func $f) async (memory (core memory $memory "mem")) (core func $f'))
+    (canon lower (func $g) async (memory (core memory $memory "mem")) (core func $g'))
     (core instance $dm (instantiate $DM (with "" (instance
       (export "mem" (memory $memory "mem"))
       (export "subtask.cancel" (func $subtask.cancel))

test/async/cancellable.wast

@@ -102,12 +102,12 @@
     )
     (type $FT (future))
     (canon task.cancel (core func $task.cancel))
-    (canon future.read $FT async (memory $memory "mem") (core func $future.read))
+    (canon future.read $FT async (memory (core memory $memory "mem")) (core func $future.read))
     (canon waitable.join (core func $waitable.join))
     (canon waitable-set.new (core func $waitable-set.new))
-    (canon waitable-set.wait cancellable (memory $memory "mem") (core func $waitable-set.wait-cancellable))
-    (canon waitable-set.wait (memory $memory "mem") (core func $waitable-set.wait))
-    (canon waitable-set.poll cancellable (memory $memory "mem") (core func $waitable-set.poll-cancellable))
+    (canon waitable-set.wait cancellable (memory (core memory $memory "mem")) (core func $waitable-set.wait-cancellable))
+    (canon waitable-set.wait (memory (core memory $memory "mem")) (core func $waitable-set.wait))
+    (canon waitable-set.poll cancellable (memory (core memory $memory "mem")) (core func $waitable-set.poll-cancellable))
     (canon thread.yield cancellable (core func $thread.yield-cancellable))
     (core instance $cm (instantiate $CM (with "" (instance
       (export "mem" (memory $memory "mem"))
@@ -122,19 +122,19 @@
     ))))
     (func (export "wait-cancel") async (result u32) (canon lift
       (core func $cm "wait-cancel")
-      async (callback (func $cm "unreachable-cb"))
+      async (callback (core func $cm "unreachable-cb"))
     ))
     (func (export "yield-cancel") async (result u32) (canon lift
       (core func $cm "yield-cancel")
-      async (callback (func $cm "unreachable-cb"))
+      async (callback (core func $cm "unreachable-cb"))
     ))
     (func (export "poll-cancel-pending") async (param "fut" $FT) (result u32) (canon lift
       (core func $cm "poll-cancel-pending")
-      async (callback (func $cm "unreachable-cb"))
+      async (callback (core func $cm "unreachable-cb"))
     ))
     (func (export "yield-cancel-pending") async (param "fut" $FT) (result u32) (canon lift
       (core func $cm "yield-cancel-pending")
-      async (callback (func $cm "unreachable-cb"))
+      async (callback (core func $cm "unreachable-cb"))
     ))
   )
 
@@ -288,14 +288,14 @@
     (canon subtask.cancel async (core func $subtask.cancel))
     (canon subtask.drop (core func $subtask.drop))
     (canon future.new $FT (core func $future.new))
-    (canon future.write $FT async (memory $memory "mem") (core func $future.write))
+    (canon future.write $FT async (memory (core memory $memory "mem")) (core func $future.write))
     (canon waitable.join (core func $waitable.join))
     (canon waitable-set.new (core func $waitable-set.new))
-    (canon waitable-set.wait (memory $memory "mem") (core func $waitable-set.wait))
-    (canon lower (func $wait-cancel) async (memory $memory "mem") (core func $wait-cancel'))
-    (canon lower (func $yield-cancel) async (memory $memory "mem") (core func $yield-cancel'))
-    (canon lower (func $poll-cancel-pending) async (memory $memory "mem") (core func $poll-cancel-pending'))
-    (canon lower (func $yield-cancel-pending) async (memory $memory "mem") (core func $yield-cancel-pending'))
+    (canon waitable-set.wait (memory (core memory $memory "mem")) (core func $waitable-set.wait))
+    (canon lower (func $wait-cancel) async (memory (core memory $memory "mem")) (core func $wait-cancel'))
+    (canon lower (func $yield-cancel) async (memory (core memory $memory "mem")) (core func $yield-cancel'))
+    (canon lower (func $poll-cancel-pending) async (memory (core memory $memory "mem")) (core func $poll-cancel-pending'))
+    (canon lower (func $yield-cancel-pending) async (memory (core memory $memory "mem")) (core func $yield-cancel-pending'))
     (core instance $dm (instantiate $DM (with "" (instance
       (export "mem" (memory $memory "mem"))
       (export "subtask.cancel" (func $subtask.cancel))

test/async/closed-stream.wast

@@ -30,7 +30,7 @@
     )
     (type $ST (stream u8))
     (canon stream.new $ST (core func $stream.new))
-    (canon stream.write $ST async (memory $memory "mem") (core func $stream.write))
+    (canon stream.write $ST async (memory (core memory $memory "mem")) (core func $stream.write))
     (canon stream.drop-writable $ST (core func $stream.drop-writable))
     (core instance $cm (instantiate $CM (with "" (instance
       (export "mem" (memory $memory "mem"))
@@ -77,8 +77,8 @@
     )
     (type $ST (stream u8))
     (canon stream.new $ST (core func $stream.new))
-    (canon stream.read $ST async (memory $memory "mem") (core func $stream.read))
-    (canon stream.write $ST async (memory $memory "mem") (core func $stream.write))
+    (canon stream.read $ST async (memory (core memory $memory "mem")) (core func $stream.read))
+    (canon stream.write $ST async (memory (core memory $memory "mem")) (core func $stream.write))
     (canon stream.drop-writable $ST (core func $stream.drop-writable))
     (canon lower (func $c "start-stream") (core func $start-stream'))
     (canon lower (func $c "drop-writable") (core func $drop-writable'))