Skip to content

[Parser] Parse local.set and global.set of tuple values correctly #6250

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
Jan 30, 2024
Merged

[Parser] Parse local.set and global.set of tuple values correctly #6250

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
429647c
[Parser] Parse local.set and global.set of tuple values correctly
tlively Jan 26, 2024
8d373d8
fix
tlively Jan 29, 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
2 changes: 2 additions & 0 deletions src/wasm-ir-builder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,8 @@ class IRBuilder : public UnifiedExpressionVisitor<IRBuilder, Result<>> {
[[nodiscard]] Result<> visitCall(Call*);
[[nodiscard]] Result<> visitCallIndirect(CallIndirect*);
[[nodiscard]] Result<> visitCallRef(CallRef*);
[[nodiscard]] Result<> visitLocalSet(LocalSet*);
[[nodiscard]] Result<> visitGlobalSet(GlobalSet*);
[[nodiscard]] Result<> visitThrow(Throw*);
[[nodiscard]] Result<> visitStringNew(StringNew*);
[[nodiscard]] Result<> visitStringEncode(StringEncode*);
Expand Down
18 changes: 18 additions & 0 deletions src/wasm/wasm-ir-builder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,21 @@ Result<> IRBuilder::visitCallRef(CallRef* curr) {
return Ok{};
}

Result<> IRBuilder::visitLocalSet(LocalSet* curr) {
auto type = func->getLocalType(curr->index);
auto val = pop(type.size());
CHECK_ERR(val);
curr->value = *val;
return Ok{};
}

Result<> IRBuilder::visitGlobalSet(GlobalSet* curr) {
auto type = wasm.getGlobal(curr->name)->type;
auto val = pop(type.size());
CHECK_ERR(val);
curr->value = *val;
return Ok{};
}
Result<> IRBuilder::visitThrow(Throw* curr) {
auto numArgs = wasm.getTag(curr->tag)->sig.params.size();
curr->operands.resize(numArgs);
Expand Down Expand Up @@ -1032,13 +1047,15 @@ Result<> IRBuilder::makeLocalGet(Index local) {

Result<> IRBuilder::makeLocalSet(Index local) {
LocalSet curr;
curr.index = local;
CHECK_ERR(visitLocalSet(&curr));
push(builder.makeLocalSet(local, curr.value));
return Ok{};
}

Result<> IRBuilder::makeLocalTee(Index local) {
LocalSet curr;
curr.index = local;
CHECK_ERR(visitLocalSet(&curr));
push(builder.makeLocalTee(local, curr.value, func->getLocalType(local)));
return Ok{};
Expand All @@ -1051,6 +1068,7 @@ Result<> IRBuilder::makeGlobalGet(Name global) {

Result<> IRBuilder::makeGlobalSet(Name global) {
GlobalSet curr;
curr.name = global;
CHECK_ERR(visitGlobalSet(&curr));
push(builder.makeGlobalSet(global, curr.value));
return Ok{};
Expand Down
57 changes: 50 additions & 7 deletions test/lit/wat-kitchen-sink.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,12 @@
;; CHECK: (global $i32 i32 (i32.const 42))
(global $i32 i32 i32.const 42)

;; CHECK: (global $pair (mut (tuple i32 i64)) (tuple.make 2
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (i64.const 1)
;; CHECK-NEXT: ))
(global $pair (mut (tuple i32 i64)) (tuple.make 2 (i32.const 0) (i64.const 1)))

;; memories
;; CHECK: (memory $mem 1 1 shared)
(memory $mem 1 1 shared)
Expand Down Expand Up @@ -457,12 +463,6 @@
;; CHECK-NEXT: )
(func $f4 (type 18) (local i32 i64) (local $l f32))

;; CHECK: (func $tuple-locals (type $void)
;; CHECK-NEXT: (local $0 (tuple i32 i32))
;; CHECK-NEXT: (nop)
;; CHECK-NEXT: )
(func $tuple-locals (local (tuple i32 i32)))

;; CHECK: (func $nop-skate (type $void)
;; CHECK-NEXT: (nop)
;; CHECK-NEXT: (nop)
Expand Down Expand Up @@ -930,6 +930,30 @@
drop
)

;; CHECK: (func $tuple-locals (type $void)
;; CHECK-NEXT: (local $0 (tuple i32 i64))
;; CHECK-NEXT: (local.set $0
;; CHECK-NEXT: (local.tee $0
;; CHECK-NEXT: (local.get $0)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: (local.set $0
;; CHECK-NEXT: (tuple.make 2
;; CHECK-NEXT: (i32.const 1)
;; CHECK-NEXT: (i64.const 2)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $tuple-locals
(local (tuple i32 i64))
local.get 0
local.tee 0
local.set 0
i32.const 1
i64.const 2
local.set 0
)

;; CHECK: (func $block (type $void)
;; CHECK-NEXT: (nop)
;; CHECK-NEXT: (block $l
Expand Down Expand Up @@ -3064,6 +3088,25 @@
global.set 4
)

;; CHECK: (func $tuple-globals (type $void)
;; CHECK-NEXT: (global.set $pair
;; CHECK-NEXT: (global.get $pair)
;; CHECK-NEXT: )
;; CHECK-NEXT: (global.set $pair
;; CHECK-NEXT: (tuple.make 2
;; CHECK-NEXT: (i32.const 1)
;; CHECK-NEXT: (i64.const 2)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $tuple-globals
global.get $pair
global.set $pair
i32.const 1
i64.const 2
global.set $pair
)

;; CHECK: (func $load (type $4) (param $0 i32) (param $1 i64)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.load $mimport$0 offset=42
Expand Down Expand Up @@ -3525,7 +3568,7 @@
(func $ref-func
ref.func $ref-func
drop
ref.func 152
ref.func 153
drop
)

Expand Down