Commit 33c40be
authored
[EH/SjLj] Support Wasm EH + Wasm SjLj (#16072)
Now that
llvm/llvm-project@eb675e9
has landed, we can use Wasm EH and Wasm SjLj together.
This PR
- enables Wasm EH + Wasm SjLj combination which was previously banned
- unifies `@with_both_exception_handling` and `@with_both_sjlj_handling`
into `@with_both_eh_sjlj`. Given that we don't really have a
plan to test Wasm EH + Emscripten SjLj combination going forward,
which was meant to be only a temporary measure during the period we
have only Wasm EH but not Wasm SjLj, I don't think it's worth the
hassle of keeping three different decorators like
`@with_both_exception_handling`, `@with_both_sjlj_handling`,
`@with_both_eh_sjlj`.
- adds `@with_both_eh_sjlj` to several more tests that mix EH + SjLj
- adds one more test that mixes EH + SjLj
- duplicates `test_longjmp` into `test_longjmp_stadnalone`. I couldn't
find a way to attach two decorators (`@with_both_eh_sjlj and
`@also_with_standalone_wasm`) to a single test.
- adds `test_longjmp_with_and_without_exceptions` and
`test_exceptions_with_and_without_longjmp`.
Fixes #15404.1 parent 89eef69 commit 33c40be
File tree
4 files changed
+142
-82
lines changed- tests
- core
4 files changed
+142
-82
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1413 | 1413 | | |
1414 | 1414 | | |
1415 | 1415 | | |
1416 | | - | |
1417 | | - | |
1418 | 1416 | | |
1419 | 1417 | | |
1420 | 1418 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
0 commit comments