Skip to content

Commit 3330407

Browse files
woesswoess
committed
Add more exception-with-param tests using catch_all and catch_ref.
1 parent 1f8793f commit 3330407

7 files changed

+144
-0
lines changed

‎wasm/src/org.graalvm.wasm.test/src/test/exceptions/exceptions_with_params_catch_all.opts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
wasm.Exceptions=true

‎wasm/src/org.graalvm.wasm.test/src/test/exceptions/exceptions_with_params_catch_all.result‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
int 14

‎wasm/src/org.graalvm.wasm.test/src/test/exceptions/exceptions_with_params_catch_all.wat‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
;;
2+
;; Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
3+
;; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
;;
5+
;; The Universal Permissive License (UPL), Version 1.0
6+
;;
7+
;; Subject to the condition set forth below, permission is hereby granted to any
8+
;; person obtaining a copy of this software, associated documentation and/or
9+
;; data (collectively the "Software"), free of charge and under any and all
10+
;; copyright rights in the Software, and any and all patent rights owned or
11+
;; freely licensable by each licensor hereunder covering either (i) the
12+
;; unmodified Software as contributed to or provided by such licensor, or (ii)
13+
;; the Larger Works (as defined below), to deal in both
14+
;;
15+
;; (a) the Software, and
16+
;;
17+
;; (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
18+
;; one is included with the Software each a "Larger Work" to which the Software
19+
;; is contributed by such licensors),
20+
;;
21+
;; without restriction, including without limitation the rights to copy, create
22+
;; derivative works of, display, perform, and distribute the Software and make,
23+
;; use, sell, offer for sale, import, export, have made, and have sold the
24+
;; Software and the Larger Work(s), and to sublicense the foregoing rights on
25+
;; either these or other terms.
26+
;;
27+
;; This license is subject to the following condition:
28+
;;
29+
;; The above copyright notice and either this complete permission notice or at a
30+
;; minimum a reference to the UPL must be included in all copies or substantial
31+
;; portions of the Software.
32+
;;
33+
;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
34+
;; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
35+
;; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
36+
;; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
37+
;; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
38+
;; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
39+
;; SOFTWARE.
40+
;;
41+
(module
42+
(type $t0 (func (param i32) (param i64)))
43+
(tag $e0 (type $t0))
44+
(tag $e1 (type $t0))
45+
46+
(func (export "_main") (result i32)
47+
(block $h0
48+
(try_table (catch_all $h0)
49+
(block $h1 (result i32 i64)
50+
(try_table (result i32 i64) (catch $e1 $h1)
51+
i32.const 1984
52+
i64.const 4398046511104
53+
throw $e0
54+
)
55+
drop ;; i64
56+
return
57+
)
58+
drop ;; i64
59+
return
60+
)
61+
i32.const -1
62+
return
63+
)
64+
;; caught exception, but no access to its fields
65+
i32.const 14
66+
)
67+
)

‎wasm/src/org.graalvm.wasm.test/src/test/exceptions/exceptions_with_params_catch_ref.opts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
wasm.Exceptions=true

‎wasm/src/org.graalvm.wasm.test/src/test/exceptions/exceptions_with_params_catch_ref.result‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
int 4

‎wasm/src/org.graalvm.wasm.test/src/test/exceptions/exceptions_with_params_catch_ref.wat‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
;;
2+
;; Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
3+
;; DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
;;
5+
;; The Universal Permissive License (UPL), Version 1.0
6+
;;
7+
;; Subject to the condition set forth below, permission is hereby granted to any
8+
;; person obtaining a copy of this software, associated documentation and/or
9+
;; data (collectively the "Software"), free of charge and under any and all
10+
;; copyright rights in the Software, and any and all patent rights owned or
11+
;; freely licensable by each licensor hereunder covering either (i) the
12+
;; unmodified Software as contributed to or provided by such licensor, or (ii)
13+
;; the Larger Works (as defined below), to deal in both
14+
;;
15+
;; (a) the Software, and
16+
;;
17+
;; (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
18+
;; one is included with the Software each a "Larger Work" to which the Software
19+
;; is contributed by such licensors),
20+
;;
21+
;; without restriction, including without limitation the rights to copy, create
22+
;; derivative works of, display, perform, and distribute the Software and make,
23+
;; use, sell, offer for sale, import, export, have made, and have sold the
24+
;; Software and the Larger Work(s), and to sublicense the foregoing rights on
25+
;; either these or other terms.
26+
;;
27+
;; This license is subject to the following condition:
28+
;;
29+
;; The above copyright notice and either this complete permission notice or at a
30+
;; minimum a reference to the UPL must be included in all copies or substantial
31+
;; portions of the Software.
32+
;;
33+
;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
34+
;; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
35+
;; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
36+
;; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
37+
;; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
38+
;; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
39+
;; SOFTWARE.
40+
;;
41+
(module
42+
(type $t0 (func (param i32)))
43+
(tag $e0 (type $t0))
44+
(tag $e1 (type $t0))
45+
46+
(func (export "_main") (result i32)
47+
block $h0 (result i32 exnref)
48+
try_table (result i32 exnref) (catch_ref $e0 $h0)
49+
block $h1 (result i32 exnref)
50+
try_table (result i32 exnref) (catch_ref $e1 $h1)
51+
i32.const 4
52+
throw $e0
53+
end
54+
drop ;; exnref
55+
drop ;; i32
56+
i32.const 42
57+
return
58+
end
59+
drop ;; exnref
60+
drop ;; i32
61+
i32.const 21
62+
return
63+
end
64+
drop ;; exnref
65+
drop ;; i32
66+
i32.const 10
67+
return
68+
end
69+
drop ;; exnref
70+
)
71+
)

‎wasm/src/org.graalvm.wasm.test/src/test/exceptions/wasm_test_index‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,7 @@ exceptions_indirect_call
33
exceptions_local_unwind
44
exceptions_single_func
55
exceptions_with_params
6+
exceptions_with_params_catch_all
7+
exceptions_with_params_catch_ref
68
multi_exception_types
79
throw_ref

0 commit comments

Comments
 (0)