Skip to content

Commit 0ed93fa

Browse files
lukewagnerlukewagner
committed
Update tests to match spec change
1 parent 484ae26 commit 0ed93fa

2 files changed

Lines changed: 39 additions & 34 deletions

File tree

‎test/async/cross-abi-calls.wast‎

Lines changed: 35 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -175,62 +175,67 @@
175175
(export "task.return16" (func $task.return16))
176176
(export "task.return17" (func $task.return17))
177177
))))
178-
(func (export "sync-4-param") (param "a" u32) (param "b" u64) (param "c" f32) (param "d" f64)
178+
(func (export "sync-4-param") async (param "a" u32) (param "b" u64) (param "c" f32) (param "d" f64)
179179
(canon lift (core func $core "sync-4-param"))
180180
)
181-
(func (export "sync-5-param") (param "a" u32) (param "b" u64) (param "c" f32) (param "d" f64) (param "e" u32)
181+
(func (export "sync-5-param") async (param "a" u32) (param "b" u64) (param "c" f32) (param "d" f64) (param "e" u32)
182182
(canon lift (core func $core "sync-5-param"))
183183
)
184-
(func (export "sync-17-param") (param "a" u32) (param "b" u64) (param "c" f32) (param "d" f64)
184+
(func (export "sync-17-param") async
185+
(param "a" u32) (param "b" u64) (param "c" f32) (param "d" f64)
185186
(param "e" u32) (param "f" u64) (param "g" f32) (param "h" f64)
186187
(param "i" u32) (param "j" u64) (param "k" f32) (param "l" f64)
187188
(param "m" u32) (param "n" u64) (param "o" f32) (param "p" f64)
188189
(param "q" u32)
189190
(canon lift (core func $core "sync-17-param") (memory $memory "mem") (realloc (func $memory "realloc")))
190191
)
191-
(func (export "sync-1-result") (result f64)
192+
(func (export "sync-1-result") async (result f64)
192193
(canon lift (core func $core "sync-1-result"))
193194
)
194-
(func (export "sync-16-result") (result (tuple u32 u64 f32 f64 u32 u64 f32 f64 u32 u64 f32 f64 u32 u64 f32 f64))
195+
(func (export "sync-16-result") async (result (tuple u32 u64 f32 f64 u32 u64 f32 f64 u32 u64 f32 f64 u32 u64 f32 f64))
195196
(canon lift (core func $core "sync-16-result") (memory $memory "mem"))
196197
)
197-
(func (export "sync-17-result") (result (tuple u32 u64 f32 f64 u32 u64 f32 f64 u32 u64 f32 f64 u32 u64 f32 f64 u32))
198+
(func (export "sync-17-result") async (result (tuple u32 u64 f32 f64 u32 u64 f32 f64 u32 u64 f32 f64 u32 u64 f32 f64 u32))
198199
(canon lift (core func $core "sync-17-result") (memory $memory "mem"))
199200
)
200-
(func (export "async-4-param") (param "a" u32) (param "b" u64) (param "c" f32) (param "d" f64)
201+
(func (export "async-4-param") async
202+
(param "a" u32) (param "b" u64) (param "c" f32) (param "d" f64)
201203
(canon lift (core func $core "async-4-param") async (callback (func $core "unreachable-cb")))
202204
)
203-
(func (export "async-5-param") (param "a" u32) (param "b" u64) (param "c" f32) (param "d" f64) (param "e" u32)
205+
(func (export "async-5-param") async
206+
(param "a" u32) (param "b" u64) (param "c" f32) (param "d" f64) (param "e" u32)
204207
(canon lift (core func $core "async-5-param") async (callback (func $core "unreachable-cb")))
205208
)
206-
(func (export "async-17-param") (param "a" u32) (param "b" u64) (param "c" f32) (param "d" f64)
209+
(func (export "async-17-param") async
210+
(param "a" u32) (param "b" u64) (param "c" f32) (param "d" f64)
207211
(param "e" u32) (param "f" u64) (param "g" f32) (param "h" f64)
208212
(param "i" u32) (param "j" u64) (param "k" f32) (param "l" f64)
209213
(param "m" u32) (param "n" u64) (param "o" f32) (param "p" f64)
210214
(param "q" u32)
211215
(canon lift (core func $core "async-17-param") async (callback (func $core "unreachable-cb")) (memory $memory "mem") (realloc (func $memory "realloc")))
212216
)
213-
(func (export "async-1-result") (result f64)
217+
(func (export "async-1-result") async (result f64)
214218
(canon lift (core func $core "async-1-result") async (callback (func $core "unreachable-cb")))
215219
)
216-
(func (export "async-16-result") (result (tuple u32 u64 f32 f64 u32 u64 f32 f64 u32 u64 f32 f64 u32 u64 f32 f64))
220+
(func (export "async-16-result") async (result (tuple u32 u64 f32 f64 u32 u64 f32 f64 u32 u64 f32 f64 u32 u64 f32 f64))
217221
(canon lift (core func $core "async-16-result") async (callback (func $core "unreachable-cb")))
218222
)
219-
(func (export "async-17-result") (result (tuple u32 u64 f32 f64 u32 u64 f32 f64 u32 u64 f32 f64 u32 u64 f32 f64 u32))
223+
(func (export "async-17-result") async (result (tuple u32 u64 f32 f64 u32 u64 f32 f64 u32 u64 f32 f64 u32 u64 f32 f64 u32))
220224
(canon lift (core func $core "async-17-result") async (callback (func $core "unreachable-cb")) (memory $memory "mem") (realloc (func $memory "realloc")))
221225
)
222226
)
223227
(component $Bottom
224-
(import "func-4-param" (func $func-4-param (param "a" u32) (param "b" u64) (param "c" f32) (param "d" f64)))
225-
(import "func-5-param" (func $func-5-param (param "a" u32) (param "b" u64) (param "c" f32) (param "d" f64) (param "e" u32)))
226-
(import "func-17-param" (func $func-17-param (param "a" u32) (param "b" u64) (param "c" f32) (param "d" f64)
228+
(import "func-4-param" (func $func-4-param async (param "a" u32) (param "b" u64) (param "c" f32) (param "d" f64)))
229+
(import "func-5-param" (func $func-5-param async (param "a" u32) (param "b" u64) (param "c" f32) (param "d" f64) (param "e" u32)))
230+
(import "func-17-param" (func $func-17-param async
231+
(param "a" u32) (param "b" u64) (param "c" f32) (param "d" f64)
227232
(param "e" u32) (param "f" u64) (param "g" f32) (param "h" f64)
228233
(param "i" u32) (param "j" u64) (param "k" f32) (param "l" f64)
229234
(param "m" u32) (param "n" u64) (param "o" f32) (param "p" f64)
230235
(param "q" u32)))
231-
(import "func-1-result" (func $func-1-result (result f64)))
232-
(import "func-16-result" (func $func-16-result (result (tuple u32 u64 f32 f64 u32 u64 f32 f64 u32 u64 f32 f64 u32 u64 f32 f64))))
233-
(import "func-17-result" (func $func-17-result (result (tuple u32 u64 f32 f64 u32 u64 f32 f64 u32 u64 f32 f64 u32 u64 f32 f64 u32))))
236+
(import "func-1-result" (func $func-1-result async (result f64)))
237+
(import "func-16-result" (func $func-16-result async (result (tuple u32 u64 f32 f64 u32 u64 f32 f64 u32 u64 f32 f64 u32 u64 f32 f64))))
238+
(import "func-17-result" (func $func-17-result async (result (tuple u32 u64 f32 f64 u32 u64 f32 f64 u32 u64 f32 f64 u32 u64 f32 f64 u32))))
234239
(core module $Memory (memory (export "mem") 1))
235240
(core instance $memory (instantiate $Memory))
236241
(core module $Core
@@ -408,18 +413,18 @@
408413
(export "sync-17-result" (func $sync-17-result))
409414
(export "async-17-result" (func $async-17-result))
410415
))))
411-
(func (export "call-sync-4-param") (result u32) (canon lift (core func $core "call-sync-4-param")))
412-
(func (export "call-async-4-param") (result u32) (canon lift (core func $core "call-async-4-param")))
413-
(func (export "call-sync-5-param") (result u32) (canon lift (core func $core "call-sync-5-param")))
414-
(func (export "call-async-5-param") (result u32) (canon lift (core func $core "call-async-5-param")))
415-
(func (export "call-sync-17-param") (result u32) (canon lift (core func $core "call-sync-17-param")))
416-
(func (export "call-async-17-param") (result u32) (canon lift (core func $core "call-async-17-param")))
417-
(func (export "call-sync-1-result") (result u32) (canon lift (core func $core "call-sync-1-result")))
418-
(func (export "call-async-1-result") (result u32) (canon lift (core func $core "call-async-1-result")))
419-
(func (export "call-sync-16-result") (result u32) (canon lift (core func $core "call-sync-16-result")))
420-
(func (export "call-async-16-result") (result u32) (canon lift (core func $core "call-async-16-result")))
421-
(func (export "call-sync-17-result") (result u32) (canon lift (core func $core "call-sync-17-result")))
422-
(func (export "call-async-17-result") (result u32) (canon lift (core func $core "call-async-17-result")))
416+
(func (export "call-sync-4-param") async (result u32) (canon lift (core func $core "call-sync-4-param")))
417+
(func (export "call-async-4-param") async (result u32) (canon lift (core func $core "call-async-4-param")))
418+
(func (export "call-sync-5-param") async (result u32) (canon lift (core func $core "call-sync-5-param")))
419+
(func (export "call-async-5-param") async (result u32) (canon lift (core func $core "call-async-5-param")))
420+
(func (export "call-sync-17-param") async (result u32) (canon lift (core func $core "call-sync-17-param")))
421+
(func (export "call-async-17-param") async (result u32) (canon lift (core func $core "call-async-17-param")))
422+
(func (export "call-sync-1-result") async (result u32) (canon lift (core func $core "call-sync-1-result")))
423+
(func (export "call-async-1-result") async (result u32) (canon lift (core func $core "call-async-1-result")))
424+
(func (export "call-sync-16-result") async (result u32) (canon lift (core func $core "call-sync-16-result")))
425+
(func (export "call-async-16-result") async (result u32) (canon lift (core func $core "call-async-16-result")))
426+
(func (export "call-sync-17-result") async (result u32) (canon lift (core func $core "call-sync-17-result")))
427+
(func (export "call-async-17-result") async (result u32) (canon lift (core func $core "call-async-17-result")))
423428
)
424429
(instance $top (instantiate $Top))
425430
(instance $bottom-to-sync (instantiate $Bottom

‎test/async/trap-on-reenter.wast‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
)
1313
)
1414
(core instance $core_inner (instantiate $CoreInner))
15-
(func $a (canon lift
15+
(func $a async (canon lift
1616
(core func $core_inner "a")
1717
async (callback (func $core_inner "a-cb"))
1818
))
1919

2020
(component $Child
21-
(import "a" (func $a))
21+
(import "a" (func $a async))
2222

2323
(core module $Memory (memory (export "mem") 1))
2424
(core instance $memory (instantiate $Memory))
@@ -37,7 +37,7 @@
3737
(core instance $core_child (instantiate $CoreChild (with "" (instance
3838
(export "a" (func $a'))
3939
))))
40-
(func (export "b") (canon lift
40+
(func (export "b") async (canon lift
4141
(core func $core_child "b")
4242
async (callback (func $core_child "b-cb"))
4343
))
@@ -57,7 +57,7 @@
5757
(core instance $core_outer (instantiate $CoreOuter (with "" (instance
5858
(export "b" (func $b))
5959
))))
60-
(func $c (export "c") (canon lift
60+
(func $c (export "c") async (canon lift
6161
(core func $core_outer "c")
6262
async (callback (func $core_outer "c-cb"))
6363
))

0 commit comments

Comments
 (0)