[js-api] Update basic and identity tests for exnref #316
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This updates `basic.tentative.any.js` and `identity.tentative.any.js` tests to use the new instructions (`try_table` and `throw_ref`). In addition to converting existing tests to use the new instruction while maintaining the semantics, I added a new test in `basic.tentative.any.js` that makes use of all four `catch` clause variants to show all catch clauses works well in JS API tests. These new tests reauire `--js-flags=--experimental-wasm-exnref` argument to chrome, which is not currently supported in WPT out of the box. I've instead confirmed these run with chrome web tests infrastructure (https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/web_tests.md#Running-Web-Tests).
aheejin
commented
Jun 27, 2024
| @@ -73,7 +73,7 @@ promise_test(async () => { | |||
| promise_test(async () => { | |||
| const builder = new WasmModuleBuilder(); | |||
| const fnIndex = builder.addImport("module", "fn", kSig_v_v); | |||
| const tagIndex= builder.addTag(kSig_v_r); | |||
| const tagIndex = builder.addTag(kSig_v_r); | |||
Comment on lines
+80
to
90
| kExprBlock, kWasmVoid, | ||
| kExprBlock, kExternRefCode, | ||
| kExprTryTable, kWasmVoid, 1, | ||
| kCatchNoRef, tagIndexExternref, 0, | ||
| kExprCallFunction, fnIndex, | ||
| kExprEnd, | ||
| kExprBr, 1, | ||
| kExprEnd, | ||
| kExprReturn, | ||
| kExprEnd, | ||
| kExprRefNull, kExternRefCode, |
There was a problem hiding this comment.
This is equivalent to
block $outer
block $catch_dest (result externref)
try_table (catch $tag-externref $catch_dest)
call $fn
end
br $outer
end
return
end
ref.null extern
Comment on lines
+109
to
119
| kExprBlock, kWasmVoid, | ||
| kExprBlock, kExnRefCode, | ||
| kExprTryTable, kWasmVoid, 1, | ||
| kCatchAllRef, 0, | ||
| kExprCallFunction, fnIndex, | ||
| kExprEnd, | ||
| kExprBr, 1, | ||
| kExprEnd, | ||
| kExprThrowRef, | ||
| kExprEnd, | ||
| kExprRefNull, kExternRefCode, |
There was a problem hiding this comment.
This is equivalent to
block $outer
block $catch_all_ref_dest (result exnref)
try_table (catch_all_ref $catch_all_ref_dest)
call $fn
end
br $outer
end
throw_ref
end
ref.null extern
Comment on lines
+144
to
+168
| kExprBlock, kWasmVoid, | ||
| kExprBlock, kExnRefCode, | ||
| kExprBlock, sig_ie_v, | ||
| kExprBlock, kWasmVoid, | ||
| kExprBlock, kWasmI32, | ||
| kExprTryTable, kWasmVoid, 4, | ||
| kCatchNoRef, tagIndexI32, 0, | ||
| kCatchAllNoRef, 1, | ||
| kCatchRef, tagIndexI32, 2, | ||
| kCatchAllRef, 3, | ||
| kExprCallFunction, fnIndex, | ||
| kExprEnd, | ||
| kExprBr, 4, | ||
| kExprEnd, | ||
| kExprReturn, | ||
| kExprEnd, | ||
| kExprBr, 2, | ||
| kExprEnd, | ||
| kExprDrop, | ||
| kExprDrop, | ||
| kExprBr, 1, | ||
| kExprEnd, | ||
| kExprDrop, | ||
| kExprEnd, | ||
| kExprI32Const, 0, |
There was a problem hiding this comment.
This is equivalent to
block $outer
block $catch_all_ref_dest (result exnref)
block $catch_ref_dest (result i32 exnref)
block $catch_all_dest
block $catch_dest (result i32)
try_table (catch $tag-i32 $catch_dest) (catch_all $catch_all_dest) (catch_ref $tag-i32 $catch_ref_dest) (catch_all_ref $catch_all_ref_dest)
call $fn
end
br $outer
end
return
end
br $outer
end
drop
drop
br $outer
end
drop
end
i32.const 0
Comment on lines
+41
to
50
| kExprBlock, kWasmVoid, | ||
| kExprBlock, sig_ie_v, | ||
| kExprTryTable, kWasmVoid, 1, | ||
| kCatchRef, jsTagIndex, 0, | ||
| kExprCallFunction, throwJSTagExnIndex, | ||
| kExprEnd, | ||
| kExprBr, 1, | ||
| kExprEnd, | ||
| kExprThrowRef, | ||
| kExprEnd |
There was a problem hiding this comment.
This is equivalent to
block $outer
block $catch_ref_dest (result i32 exnref)
try_table (catch_ref $js_tag $catch_ref_dest)
call $throw_js_tag_exn
end
br $outer
end
throw_ref
end
Comment on lines
+59
to
68
| kExprBlock, kWasmVoid, | ||
| kExprBlock, sig_ie_v, | ||
| kExprTryTable, kWasmVoid, 1, | ||
| kCatchRef, wasmTagIndex, 0, | ||
| kExprCallFunction, throwWasmTagExnIndex, | ||
| kExprEnd, | ||
| kExprBr, 1, | ||
| kExprEnd, | ||
| kExprThrowRef, | ||
| kExprEnd |
There was a problem hiding this comment.
This is equivalent to
block $outer
block $catch_ref_dest (result i32 exnref)
try_table (catch_ref $wasm_tag $catch_ref_dest)
call $throw_wasm_tag_exn
end
br $outer
end
throw_ref
end
Comment on lines
+77
to
86
| kExprBlock, kWasmVoid, | ||
| kExprBlock, kExnRefCode, | ||
| kExprTryTable, kWasmVoid, 1, | ||
| kCatchAllRef, 0, | ||
| kExprCallFunction, throwJSTagExnIndex, | ||
| kExprEnd, | ||
| kExprBr, 1, | ||
| kExprEnd, | ||
| kExprThrowRef, | ||
| kExprEnd |
There was a problem hiding this comment.
This is equivalent to
block $outer
block $catch_all_ref_dest (result exnref)
try_table (catch_all_ref $js_tag $catch_all_ref_dest)
call $throw_js_tag_exn
end
br $outer
end
throw_ref
end
Comment on lines
+95
to
104
| kExprBlock, kWasmVoid, | ||
| kExprBlock, kExnRefCode, | ||
| kExprTryTable, kWasmVoid, 1, | ||
| kCatchAllRef, 0, | ||
| kExprCallFunction, throwWasmTagExnIndex, | ||
| kExprEnd, | ||
| kExprBr, 1, | ||
| kExprEnd, | ||
| kExprThrowRef, | ||
| kExprEnd |
There was a problem hiding this comment.
This is equivalent to
block $outer
block $catch_all_ref_dest (result exnref)
try_table (catch_all_ref $wasm_tag $catch_all_ref_dest)
call $throw_wasm_tag_exn
end
br $outer
end
throw_ref
end
Comment on lines
+113
to
+123
| kExprBlock, kWasmVoid, | ||
| kExprBlock, kWasmI32, | ||
| kExprTryTable, kWasmVoid, 1, | ||
| kCatchNoRef, jsTagIndex, 0, | ||
| kExprCallFunction, throwJSTagExnIndex, | ||
| kExprEnd, | ||
| kExprBr, 1, | ||
| kExprEnd, | ||
| kExprReturn, | ||
| kExprEnd | ||
| kExprEnd, | ||
| kExprI32Const, 0 |
There was a problem hiding this comment.
This is equivalent to
block $outer
block $catch_dest (result i32)
try_table (catch $js_tag $catch_dest)
call $throw_js_tag_exn
end
br $outer
end
return
end
i32.const 0
Comment on lines
+132
to
141
| kExprBlock, kWasmVoid, | ||
| kExprBlock, kWasmI32, | ||
| kExprTryTable, kWasmVoid, 1, | ||
| kCatchNoRef, jsTagIndex, 0, | ||
| kExprCallFunction, throwJSTagExnIndex, | ||
| kExprEnd, | ||
| kExprBr, 1, | ||
| kExprEnd, | ||
| kExprThrow, jsTagIndex, | ||
| kExprEnd |
There was a problem hiding this comment.
This is equivalent to
block $outer
block $catch_dest (result i32)
try_table (catch $js_tag $catch_dest)
call $throw_js_tag_exn
end
br $outer
end
throw $js_tag
end
dschuff
approved these changes
Jun 28, 2024
Ms2ger
approved these changes
Jul 4, 2024
Co-authored-by: Ms2ger <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This updates
basic.tentative.any.jsandidentity.tentative.any.jstests to use the new instructions (try_tableandthrow_ref). In addition to converting existing tests to use the new instruction while maintaining the semantics, I added a new test inbasic.tentative.any.jsthat makes use of all fourcatchclause variants to show all catch clauses works well in JS API tests.These new tests reauire
--js-flags=--experimental-wasm-exnrefargument to chrome, which is not currently supported in WPT out of the box. I've instead confirmed these run with chrome web tests infrastructure (https://chromium.googlesource.com/chromium/src/+/HEAD/docs/testing/web_tests.md#Running-Web-Tests).