Skip to content

[Strings] Add a string-builtins feature, and lift/lower automatically when enabled #7601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 26 commits into
base: main
Choose a base branch
from
Open

[Strings] Add a string-builtins feature, and lift/lower automatically when enabled #7601

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
5db98f4
start
kripken May 15, 2025
36d89d5
work
kripken May 15, 2025
956d45a
docs
kripken May 15, 2025
b72d753
p
kripken May 15, 2025
3b21cf2
format
kripken May 15, 2025
adad0dc
work
kripken May 15, 2025
c636685
work
kripken May 15, 2025
7bf1cf7
finish
kripken May 15, 2025
8ad61b5
Merge remote-tracking branch 'origin/main' into sb
kripken May 15, 2025
48f05f7
test
kripken May 15, 2025
60637f9
test
kripken May 15, 2025
3195ac2
test
kripken May 15, 2025
4dd6747
test
kripken May 16, 2025
3c29e7b
use magic imports [ci skip]
kripken May 16, 2025
8ae39b8
Merge remote-tracking branch 'origin/main' into sb
kripken May 16, 2025
bbd6804
gate the pass behind GC
kripken May 16, 2025
2e82f9a
update test
kripken May 16, 2025
0feeeae
work
kripken May 16, 2025
02d1d23
update exact result in test, likely because of the new pass we run
kripken May 16, 2025
57ac595
so many tests to update
kripken May 16, 2025
00b3c1b
fix feature reading
kripken May 19, 2025
123b879
fix unit test
kripken May 19, 2025
dfa5231
gc is needed too, now, for string optimization
kripken May 19, 2025
77b7f6e
fix: some tests have type updates due to another pass being run
kripken May 19, 2025
17c5019
simplify test as suggested
kripken May 19, 2025
0a447e5
don't fuzz string builtins yet
kripken May 19, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: some tests have type updates due to another pass being run
  • Loading branch information
@kripken
kripken committed May 19, 2025
commit 77b7f6ed7efeded4443d33afc27521aaf5948c39
118 changes: 59 additions & 59 deletions test/lit/basic/extra-branch-values.wast
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you know why the type indices are changing here? Are we actually emitting more types in the output?
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we are just running a type-rewriting pass we weren't before, leading to different sorting of the names.
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
(import "env" "use-i32-any" (func $use-i32-any (param i32 (ref any))))

;; CHECK: (tag $e (type $7) (param i32))
;; OPT_O: (tag $e (type $5) (param i32))
;; OPT_O: (tag $e (type $9) (param i32))
(tag $e (param i32))
;; CHECK: (tag $e2 (type $7) (param i32))
;; OPT_O: (tag $e2 (type $5) (param i32))
;; OPT_O: (tag $e2 (type $9) (param i32))
(tag $e2 (param i32))

;; CHECK: (func $br_on_null-one (type $8) (param $0 i32) (param $1 anyref) (result i32)
Expand Down Expand Up @@ -76,7 +76,7 @@
;; CHECK-NEXT: (local.get $scratch_3)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; OPT_O: (func $br_on_null-one (type $6) (param $0 i32) (param $1 anyref) (result i32)
;; OPT_O: (func $br_on_null-one (type $10) (param $0 i32) (param $1 anyref) (result i32)
;; OPT_O-NEXT: (block $block (result i32)
;; OPT_O-NEXT: (block $block0
;; OPT_O-NEXT: (global.set $any
Expand Down Expand Up @@ -168,7 +168,7 @@
;; CHECK-NEXT: )
;; OPT_O: (func $br_on_null-two (type $16) (param $0 i32) (param $1 i64) (param $2 anyref) (result i32 i64)
;; OPT_O-NEXT: (local $3 (tuple i32 i64))
;; OPT_O-NEXT: (block $block (type $11) (result i32 i64)
;; OPT_O-NEXT: (block $block (type $8) (result i32 i64)
;; OPT_O-NEXT: (local.set $3
;; OPT_O-NEXT: (tuple.make 2
;; OPT_O-NEXT: (local.get $0)
Expand Down Expand Up @@ -254,8 +254,8 @@
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; OPT_O: (func $br_on_non_null-one (type $7) (param $0 i32) (param $1 anyref) (result i32 (ref any))
;; OPT_O-NEXT: (block $block (type $1) (result i32 (ref any))
;; OPT_O: (func $br_on_non_null-one (type $11) (param $0 i32) (param $1 anyref) (result i32 (ref any))
;; OPT_O-NEXT: (block $block (type $7) (result i32 (ref any))
;; OPT_O-NEXT: (tuple.make 2
;; OPT_O-NEXT: (local.get $0)
;; OPT_O-NEXT: (block $block0 (result (ref any))
Expand Down Expand Up @@ -350,8 +350,8 @@
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; OPT_O: (func $br_on_non_null-two (type $8) (param $0 i32) (param $1 i64) (param $2 anyref) (result i32 i64 (ref any))
;; OPT_O-NEXT: (block $block (type $4) (result i32 i64 (ref any))
;; OPT_O: (func $br_on_non_null-two (type $12) (param $0 i32) (param $1 i64) (param $2 anyref) (result i32 i64 (ref any))
;; OPT_O-NEXT: (block $block (type $6) (result i32 i64 (ref any))
;; OPT_O-NEXT: (tuple.make 3
;; OPT_O-NEXT: (local.get $0)
;; OPT_O-NEXT: (local.get $1)
Expand Down Expand Up @@ -441,8 +441,8 @@
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; OPT_O: (func $br_on_cast-one (type $3) (param $0 i32) (param $1 anyref) (result i32 eqref)
;; OPT_O-NEXT: (block $block (type $0) (result i32 eqref)
;; OPT_O: (func $br_on_cast-one (type $0) (param $0 i32) (param $1 anyref) (result i32 eqref)
;; OPT_O-NEXT: (block $block (type $5) (result i32 eqref)
;; OPT_O-NEXT: (tuple.make 2
;; OPT_O-NEXT: (local.get $0)
;; OPT_O-NEXT: (block $block0 (result eqref)
Expand Down Expand Up @@ -550,7 +550,7 @@
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; OPT_O: (func $br_on_cast-two (type $17) (param $0 i32) (param $1 i64) (param $2 anyref) (result i32 i64 eqref)
;; OPT_O-NEXT: (block $block (type $12) (result i32 i64 eqref)
;; OPT_O-NEXT: (block $block (type $4) (result i32 i64 eqref)
;; OPT_O-NEXT: (tuple.make 3
;; OPT_O-NEXT: (local.get $0)
;; OPT_O-NEXT: (local.get $1)
Expand Down Expand Up @@ -644,7 +644,7 @@
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; OPT_O: (func $br_on_cast-nn (type $18) (param $0 i32) (param $1 (ref any)) (result i32 (ref eq))
;; OPT_O-NEXT: (block $block (type $2) (result i32 (ref eq))
;; OPT_O-NEXT: (block $block (type $3) (result i32 (ref eq))
;; OPT_O-NEXT: (tuple.make 2
;; OPT_O-NEXT: (local.get $0)
;; OPT_O-NEXT: (block $block0 (result (ref eq))
Expand Down Expand Up @@ -730,7 +730,7 @@
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; OPT_O: (func $br_on_cast-to-nn (type $19) (param $0 i32) (param $1 anyref) (result i32 (ref eq))
;; OPT_O-NEXT: (block $block (type $2) (result i32 (ref eq))
;; OPT_O-NEXT: (block $block (type $3) (result i32 (ref eq))
;; OPT_O-NEXT: (tuple.make 2
;; OPT_O-NEXT: (local.get $0)
;; OPT_O-NEXT: (block $block0 (result (ref eq))
Expand Down Expand Up @@ -815,8 +815,8 @@
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; OPT_O: (func $br_on_cast_fail-one (type $7) (param $0 i32) (param $1 anyref) (result i32 (ref any))
;; OPT_O-NEXT: (block $block (type $1) (result i32 (ref any))
;; OPT_O: (func $br_on_cast_fail-one (type $11) (param $0 i32) (param $1 anyref) (result i32 (ref any))
;; OPT_O-NEXT: (block $block (type $7) (result i32 (ref any))
;; OPT_O-NEXT: (tuple.make 2
;; OPT_O-NEXT: (local.get $0)
;; OPT_O-NEXT: (block $block0 (result (ref any))
Expand Down Expand Up @@ -923,8 +923,8 @@
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; OPT_O: (func $br_on_cast_fail-two (type $8) (param $0 i32) (param $1 i64) (param $2 anyref) (result i32 i64 (ref any))
;; OPT_O-NEXT: (block $block (type $4) (result i32 i64 (ref any))
;; OPT_O: (func $br_on_cast_fail-two (type $12) (param $0 i32) (param $1 i64) (param $2 anyref) (result i32 i64 (ref any))
;; OPT_O-NEXT: (block $block (type $6) (result i32 i64 (ref any))
;; OPT_O-NEXT: (tuple.make 3
;; OPT_O-NEXT: (local.get $0)
;; OPT_O-NEXT: (local.get $1)
Expand Down Expand Up @@ -1018,7 +1018,7 @@
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; OPT_O: (func $br_on_cast_fail-nn (type $20) (param $0 i32) (param $1 (ref any)) (result i32 (ref any))
;; OPT_O-NEXT: (block $block (type $1) (result i32 (ref any))
;; OPT_O-NEXT: (block $block (type $7) (result i32 (ref any))
;; OPT_O-NEXT: (tuple.make 2
;; OPT_O-NEXT: (local.get $0)
;; OPT_O-NEXT: (block $block0 (result (ref any))
Expand Down Expand Up @@ -1103,8 +1103,8 @@
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; OPT_O: (func $br_on_cast_fail-to-nn (type $9) (param $0 i32) (param $1 anyref) (result i32 anyref)
;; OPT_O-NEXT: (block $block (type $13) (result i32 anyref)
;; OPT_O: (func $br_on_cast_fail-to-nn (type $13) (param $0 i32) (param $1 anyref) (result i32 anyref)
;; OPT_O-NEXT: (block $block (type $2) (result i32 anyref)
;; OPT_O-NEXT: (tuple.make 2
;; OPT_O-NEXT: (local.get $0)
;; OPT_O-NEXT: (block $block0 (result anyref)
Expand Down Expand Up @@ -1187,7 +1187,7 @@
;; CHECK-NEXT: )
;; CHECK-NEXT: (local.get $scratch_7)
;; CHECK-NEXT: )
;; OPT_O: (func $unreachable-fallthrough (type $6) (param $0 i32) (param $1 anyref) (result i32)
;; OPT_O: (func $unreachable-fallthrough (type $10) (param $0 i32) (param $1 anyref) (result i32)
;; OPT_O-NEXT: (drop
;; OPT_O-NEXT: (block $l0 (result (ref any))
;; OPT_O-NEXT: (br_on_non_null $l0
Expand Down Expand Up @@ -1294,7 +1294,7 @@
;; CHECK-NEXT: )
;; OPT_O: (func $matching-branches (type $21) (param $0 i32) (param $1 anyref) (param $2 i32) (param $3 anyref) (result i32 eqref)
;; OPT_O-NEXT: (local $4 eqref)
;; OPT_O-NEXT: (block $block (type $0) (result i32 eqref)
;; OPT_O-NEXT: (block $block (type $5) (result i32 eqref)
;; OPT_O-NEXT: (local.set $4
;; OPT_O-NEXT: (block $block0 (result eqref)
;; OPT_O-NEXT: (global.set $any
Expand Down Expand Up @@ -1453,7 +1453,7 @@
;; CHECK-NEXT: )
;; OPT_O: (func $different-branches (type $22) (param $0 i32) (param $1 anyref) (param $2 i32) (param $3 eqref) (param $4 anyref) (result i32 eqref)
;; OPT_O-NEXT: (local $5 (tuple i32 eqref))
;; OPT_O-NEXT: (block $block (type $0) (result i32 eqref)
;; OPT_O-NEXT: (block $block (type $5) (result i32 eqref)
;; OPT_O-NEXT: (block $block1
;; OPT_O-NEXT: (br $block
;; OPT_O-NEXT: (tuple.make 2
Expand Down Expand Up @@ -1626,7 +1626,7 @@
;; CHECK-NEXT: )
;; OPT_O: (func $different-branches-2 (type $23) (param $0 i32) (param $1 eqref) (param $2 anyref) (param $3 i32) (param $4 anyref) (result i32 eqref)
;; OPT_O-NEXT: (local $5 (tuple i32 eqref))
;; OPT_O-NEXT: (block $block (type $0) (result i32 eqref)
;; OPT_O-NEXT: (block $block (type $5) (result i32 eqref)
;; OPT_O-NEXT: (block $block0
;; OPT_O-NEXT: (br $block
;; OPT_O-NEXT: (tuple.make 2
Expand Down Expand Up @@ -1793,7 +1793,7 @@
;; OPT_O-NEXT: (block $block10
;; OPT_O-NEXT: (br $block1
;; OPT_O-NEXT: (tuple.extract 2 0
;; OPT_O-NEXT: (block $block (type $0) (result i32 eqref)
;; OPT_O-NEXT: (block $block (type $5) (result i32 eqref)
;; OPT_O-NEXT: (tuple.make 2
;; OPT_O-NEXT: (local.get $0)
;; OPT_O-NEXT: (block $block0 (result eqref)
Expand Down Expand Up @@ -1896,7 +1896,7 @@
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; OPT_O: (func $with-block-param (type $25) (param $0 i64) (param $1 anyref) (result i64 eqref)
;; OPT_O-NEXT: (block $block (type $14) (result i64 eqref)
;; OPT_O-NEXT: (block $block (type $1) (result i64 eqref)
;; OPT_O-NEXT: (tuple.make 2
;; OPT_O-NEXT: (local.get $0)
;; OPT_O-NEXT: (block $block0 (result eqref)
Expand Down Expand Up @@ -2098,7 +2098,7 @@
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; OPT_O: (func $loop-results (type $9) (param $0 i32) (param $1 anyref) (result i32 anyref)
;; OPT_O: (func $loop-results (type $13) (param $0 i32) (param $1 anyref) (result i32 anyref)
;; OPT_O-NEXT: (local $2 (tuple i32 anyref))
;; OPT_O-NEXT: (local $3 eqref)
;; OPT_O-NEXT: (local.set $2
Expand All @@ -2107,12 +2107,12 @@
;; OPT_O-NEXT: (local.get $1)
;; OPT_O-NEXT: )
;; OPT_O-NEXT: )
;; OPT_O-NEXT: (loop $label2 (type $1) (result i32 (ref any))
;; OPT_O-NEXT: (block $label3 (type $1) (result i32 (ref any))
;; OPT_O-NEXT: (loop $label2 (type $7) (result i32 (ref any))
;; OPT_O-NEXT: (block $label3 (type $7) (result i32 (ref any))
;; OPT_O-NEXT: (local.set $2
;; OPT_O-NEXT: (block $label (type $0) (result i32 eqref)
;; OPT_O-NEXT: (block $label (type $5) (result i32 eqref)
;; OPT_O-NEXT: (br $label3
;; OPT_O-NEXT: (block $label1 (type $1) (result i32 (ref any))
;; OPT_O-NEXT: (block $label1 (type $7) (result i32 (ref any))
;; OPT_O-NEXT: (local.set $3
;; OPT_O-NEXT: (block $label0 (result eqref)
;; OPT_O-NEXT: (br $label1
Expand Down Expand Up @@ -2215,13 +2215,13 @@
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; OPT_O: (func $if (type $10) (param $0 i32) (param $1 i32) (param $2 anyref) (result i32 eqref)
;; OPT_O-NEXT: (block $label (type $0) (result i32 eqref)
;; OPT_O: (func $if (type $14) (param $0 i32) (param $1 i32) (param $2 anyref) (result i32 eqref)
;; OPT_O-NEXT: (block $label (type $5) (result i32 eqref)
;; OPT_O-NEXT: (tuple.make 2
;; OPT_O-NEXT: (local.get $1)
;; OPT_O-NEXT: (block $label0 (result eqref)
;; OPT_O-NEXT: (br $label
;; OPT_O-NEXT: (if (type $0) (result i32 eqref)
;; OPT_O-NEXT: (if (type $5) (result i32 eqref)
;; OPT_O-NEXT: (local.get $0)
;; OPT_O-NEXT: (then
;; OPT_O-NEXT: (global.set $any
Expand Down Expand Up @@ -2327,13 +2327,13 @@
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; OPT_O: (func $else (type $10) (param $0 i32) (param $1 i32) (param $2 anyref) (result i32 eqref)
;; OPT_O-NEXT: (block $label (type $0) (result i32 eqref)
;; OPT_O: (func $else (type $14) (param $0 i32) (param $1 i32) (param $2 anyref) (result i32 eqref)
;; OPT_O-NEXT: (block $label (type $5) (result i32 eqref)
;; OPT_O-NEXT: (tuple.make 2
;; OPT_O-NEXT: (local.get $1)
;; OPT_O-NEXT: (block $label0 (result eqref)
;; OPT_O-NEXT: (br $label
;; OPT_O-NEXT: (if (type $0) (result i32 eqref)
;; OPT_O-NEXT: (if (type $5) (result i32 eqref)
;; OPT_O-NEXT: (local.get $0)
;; OPT_O-NEXT: (then
;; OPT_O-NEXT: (tuple.make 2
Expand Down Expand Up @@ -2469,12 +2469,12 @@
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; OPT_O: (func $if-else-params (type $27) (param $0 i32) (param $1 i32) (param $2 anyref) (param $3 anyref) (result i32 eqref)
;; OPT_O-NEXT: (block $label (type $0) (result i32 eqref)
;; OPT_O-NEXT: (block $label (type $5) (result i32 eqref)
;; OPT_O-NEXT: (tuple.make 2
;; OPT_O-NEXT: (local.get $0)
;; OPT_O-NEXT: (block $label0 (result eqref)
;; OPT_O-NEXT: (br $label
;; OPT_O-NEXT: (if (type $0) (result i32 eqref)
;; OPT_O-NEXT: (if (type $5) (result i32 eqref)
;; OPT_O-NEXT: (local.get $1)
;; OPT_O-NEXT: (then
;; OPT_O-NEXT: (global.set $any
Expand Down Expand Up @@ -2573,13 +2573,13 @@
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; OPT_O: (func $try-catch (type $3) (param $0 i32) (param $1 anyref) (result i32 eqref)
;; OPT_O-NEXT: (block $label (type $0) (result i32 eqref)
;; OPT_O: (func $try-catch (type $0) (param $0 i32) (param $1 anyref) (result i32 eqref)
;; OPT_O-NEXT: (block $label (type $5) (result i32 eqref)
;; OPT_O-NEXT: (tuple.make 2
;; OPT_O-NEXT: (local.get $0)
;; OPT_O-NEXT: (block $label0 (result eqref)
;; OPT_O-NEXT: (br $label
;; OPT_O-NEXT: (try (type $0) (result i32 eqref)
;; OPT_O-NEXT: (try (type $5) (result i32 eqref)
;; OPT_O-NEXT: (do
;; OPT_O-NEXT: (call $use-i32-any
;; OPT_O-NEXT: (local.get $0)
Expand Down Expand Up @@ -2670,13 +2670,13 @@
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; OPT_O: (func $try-catch_all (type $3) (param $0 i32) (param $1 anyref) (result i32 eqref)
;; OPT_O-NEXT: (block $label (type $0) (result i32 eqref)
;; OPT_O: (func $try-catch_all (type $0) (param $0 i32) (param $1 anyref) (result i32 eqref)
;; OPT_O-NEXT: (block $label (type $5) (result i32 eqref)
;; OPT_O-NEXT: (tuple.make 2
;; OPT_O-NEXT: (local.get $0)
;; OPT_O-NEXT: (block $label0 (result eqref)
;; OPT_O-NEXT: (br $label
;; OPT_O-NEXT: (try (type $0) (result i32 eqref)
;; OPT_O-NEXT: (try (type $5) (result i32 eqref)
;; OPT_O-NEXT: (do
;; OPT_O-NEXT: (call $use-i32-any
;; OPT_O-NEXT: (local.get $0)
Expand Down Expand Up @@ -2763,13 +2763,13 @@
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; OPT_O: (func $try-delegate (type $3) (param $0 i32) (param $1 anyref) (result i32 eqref)
;; OPT_O-NEXT: (block $label (type $0) (result i32 eqref)
;; OPT_O: (func $try-delegate (type $0) (param $0 i32) (param $1 anyref) (result i32 eqref)
;; OPT_O-NEXT: (block $label (type $5) (result i32 eqref)
;; OPT_O-NEXT: (tuple.make 2
;; OPT_O-NEXT: (local.get $0)
;; OPT_O-NEXT: (block $label0 (result eqref)
;; OPT_O-NEXT: (br $label
;; OPT_O-NEXT: (try (type $0) (result i32 eqref)
;; OPT_O-NEXT: (try (type $5) (result i32 eqref)
;; OPT_O-NEXT: (do
;; OPT_O-NEXT: (call $use-i32-any
;; OPT_O-NEXT: (local.get $0)
Expand Down Expand Up @@ -2869,13 +2869,13 @@
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; OPT_O: (func $try-everything-params (type $3) (param $0 i32) (param $1 anyref) (result i32 eqref)
;; OPT_O-NEXT: (block $label (type $0) (result i32 eqref)
;; OPT_O: (func $try-everything-params (type $0) (param $0 i32) (param $1 anyref) (result i32 eqref)
;; OPT_O-NEXT: (block $label (type $5) (result i32 eqref)
;; OPT_O-NEXT: (tuple.make 2
;; OPT_O-NEXT: (local.get $0)
;; OPT_O-NEXT: (block $label0 (result eqref)
;; OPT_O-NEXT: (br $label
;; OPT_O-NEXT: (try (type $0) (result i32 eqref)
;; OPT_O-NEXT: (try (type $5) (result i32 eqref)
;; OPT_O-NEXT: (do
;; OPT_O-NEXT: (call $use-i32-any
;; OPT_O-NEXT: (local.get $0)
Expand Down Expand Up @@ -2975,13 +2975,13 @@
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; OPT_O: (func $try_table (type $3) (param $0 i32) (param $1 anyref) (result i32 eqref)
;; OPT_O-NEXT: (block $label (type $0) (result i32 eqref)
;; OPT_O: (func $try_table (type $0) (param $0 i32) (param $1 anyref) (result i32 eqref)
;; OPT_O-NEXT: (block $label (type $5) (result i32 eqref)
;; OPT_O-NEXT: (tuple.make 2
;; OPT_O-NEXT: (local.get $0)
;; OPT_O-NEXT: (block $label0 (result eqref)
;; OPT_O-NEXT: (br $label
;; OPT_O-NEXT: (try_table (type $0) (result i32 eqref)
;; OPT_O-NEXT: (try_table (type $5) (result i32 eqref)
;; OPT_O-NEXT: (call $use-i32-any
;; OPT_O-NEXT: (local.get $0)
;; OPT_O-NEXT: (br_on_cast $label0 anyref eqref
Expand Down Expand Up @@ -3058,13 +3058,13 @@
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; OPT_O: (func $try_table-params (type $3) (param $0 i32) (param $1 anyref) (result i32 eqref)
;; OPT_O-NEXT: (block $label (type $0) (result i32 eqref)
;; OPT_O: (func $try_table-params (type $0) (param $0 i32) (param $1 anyref) (result i32 eqref)
;; OPT_O-NEXT: (block $label (type $5) (result i32 eqref)
;; OPT_O-NEXT: (tuple.make 2
;; OPT_O-NEXT: (local.get $0)
;; OPT_O-NEXT: (block $label0 (result eqref)
;; OPT_O-NEXT: (br $label
;; OPT_O-NEXT: (try_table (type $2) (result i32 (ref eq))
;; OPT_O-NEXT: (try_table (type $3) (result i32 (ref eq))
;; OPT_O-NEXT: (call $use-i32-any
;; OPT_O-NEXT: (local.get $0)
;; OPT_O-NEXT: (br_on_cast $label0 anyref eqref
Expand Down Expand Up @@ -3143,8 +3143,8 @@
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; OPT_O: (func $branch-to-func (type $3) (param $0 i32) (param $1 anyref) (result i32 eqref)
;; OPT_O-NEXT: (block $label (type $0) (result i32 eqref)
;; OPT_O: (func $branch-to-func (type $0) (param $0 i32) (param $1 anyref) (result i32 eqref)
;; OPT_O-NEXT: (block $label (type $5) (result i32 eqref)
;; OPT_O-NEXT: (tuple.make 2
;; OPT_O-NEXT: (local.get $0)
;; OPT_O-NEXT: (block $label0 (result eqref)
Expand Down
4 changes: 2 additions & 2 deletions test/lit/passes/O3_stack-switching.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
(type $cont (cont $function_1))
;; CHECK: (type $fiber (struct (field $handlers (ref $handlers)) (field $cont (ref $cont))))
(type $fiber (struct (field $handlers (ref $handlers)) (field $cont (ref $cont))))
;; CHECK: (tag $exception (type $8) (param (ref eq)))
;; CHECK: (tag $exception (type $9) (param (ref eq)))
(tag $exception (param (ref eq)))
;; CHECK: (tag $effect (type $9) (param (ref eq)) (result (ref eq) (ref eq)))
;; CHECK: (tag $effect (type $8) (param (ref eq)) (result (ref eq) (ref eq)))
(tag $effect (param (ref eq)) (result (ref eq) (ref eq)))

;; CHECK: (func $resume (type $10) (param $0 (ref $fiber)) (param $1 (ref $closure)) (param $2 (ref eq)) (result (ref eq))
Expand Down
Loading
Loading