Skip to content

[Parser] Use unreachables to fulfill tuple requirements #6488

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

Merged
tlively merged 2 commits into from
Apr 11, 2024
Merged

[Parser] Use unreachables to fulfill tuple requirements #6488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1a0716
[Parser] Use unreachables to fulfill tuple requirements
tlively Apr 11, 2024
59c021e
comment
tlively Apr 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/wasm/wasm-ir-builder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,9 @@ Result<Expression*> IRBuilder::pop(size_t size) {
CHECK_ERR(packageHoistedValue(*hoisted, size));

auto* ret = scope.exprStack.back();
if (ret->type.size() == size) {
// If the top value has the correct size, we can pop it and be done.
// Unreachable values satisfy any size.
if (ret->type.size() == size || ret->type == Type::unreachable) {
Copy link
Member

@kripken kripken Apr 11, 2024

Choose a reason for hiding this comment

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

From your description I thought this was for tuples, but ret->type.size() == size can be the case for non-tuples too, can't it? (when size == 1)

Copy link
Member Author

@tlively tlively Apr 11, 2024

Choose a reason for hiding this comment

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

Yes, but since we report the size of Type::unreachable as 1, this code path was already taken for singular unreachable popped values.

Copy link
Member

@kripken kripken Apr 11, 2024

Choose a reason for hiding this comment

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

I see, thanks. Maybe worth a comment?

scope.exprStack.pop_back();
return ret;
}
Expand Down
5 changes: 1 addition & 4 deletions test/lit/wat-kitchen-sink.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3652,10 +3652,7 @@
;; CHECK-NEXT: (local.get $0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (return
;; CHECK-NEXT: (tuple.make 2
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $return-two-second-unreachable (param i32) (result i32 i64)
Expand Down