Skip to content

Commit 9f16cd1

Browse files
committed
Move to existing test files
1 parent 9e9756e commit 9f16cd1

File tree

3 files changed

+61
-65
lines changed

3 files changed

+61
-65
lines changed

test/core/try-br-interactions.wast

-65
This file was deleted.

test/core/try_catch.wast

+14
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,16 @@
147147
(catch $e0 (i32.const 1))
148148
)
149149
)
150+
151+
(func $throw (throw $e0))
152+
153+
(func (export "break-try-catch")
154+
(try (do (br 0)) (catch $e0))
155+
)
156+
157+
(func (export "break-try-catch_all")
158+
(try (do (br 0)) (catch_all))
159+
)
150160
)
151161

152162
(assert_return (invoke "empty-catch"))
@@ -188,6 +198,10 @@
188198
(assert_return (invoke "catchless-try" (i32.const 0)) (i32.const 0))
189199
(assert_return (invoke "catchless-try" (i32.const 1)) (i32.const 1))
190200

201+
(assert_return (invoke "break-try-catch"))
202+
(assert_return (invoke "break-try-catch_all"))
203+
204+
191205
(module
192206
(func $imported-throw (import "test" "throw"))
193207
(tag $e0)

test/core/try_delegate.wast

+47
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,48 @@
115115
(delegate $l3))))
116116
unreachable)
117117
(catch_all (i32.const 1))))
118+
119+
(func $throw (throw $e0))
120+
121+
(func (export "break-try-delegate")
122+
(try (do (br 0)) (delegate 0))
123+
)
124+
125+
(func (export "break-and-call-throw") (result i32)
126+
(try $outer (result i32)
127+
(do
128+
(try (result i32)
129+
(do
130+
(block $a
131+
(try (do (br $a)) (delegate $outer))
132+
)
133+
(call $throw)
134+
(i32.const 0)
135+
)
136+
(catch $e0 (i32.const 1))
137+
)
138+
)
139+
(catch $e0 (i32.const 2))
140+
)
141+
)
142+
143+
(func (export "break-and-throw") (result i32)
144+
(try $outer (result i32)
145+
(do
146+
(try (result i32)
147+
(do
148+
(block $a
149+
(try (do (br $a)) (delegate $outer))
150+
)
151+
(throw $e0)
152+
(i32.const 0)
153+
)
154+
(catch $e0 (i32.const 1))
155+
)
156+
)
157+
(catch $e0 (i32.const 2))
158+
)
159+
)
118160
)
119161

120162
(assert_return (invoke "delegate-no-throw") (i32.const 1))
@@ -140,6 +182,11 @@
140182

141183
(assert_return (invoke "delegate-correct-targets") (i32.const 1))
142184

185+
(assert_return (invoke "break-try-delegate"))
186+
187+
(assert_return (invoke "break-and-call-throw") (i32.const 1))
188+
(assert_return (invoke "break-and-throw") (i32.const 1))
189+
143190
(assert_malformed
144191
(module quote "(module (func (delegate 0)))")
145192
"unexpected token"

0 commit comments

Comments
 (0)