Skip to content

[Shared Everything] struct.wait on unshared should trap #8498

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
kripken merged 9 commits into from
Mar 19, 2026
Merged

[Shared Everything] struct.wait on unshared should trap #8498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
eb14b51
go
kripken Mar 19, 2026
a7521ac
Merge remote-tracking branch 'origin/main' into HEAD
kripken Mar 19, 2026
f1faf34
struct
kripken Mar 19, 2026
ac240db
go
kripken Mar 19, 2026
59a108e
:wqMerge remote-tracking branch 'origin/main' into HEAD
kripken Mar 19, 2026
2ce7bde
go
kripken Mar 19, 2026
da4deef
update spec test
kripken Mar 19, 2026
a91a452
go all-in on spec test
kripken Mar 19, 2026
00653dd
finish
kripken Mar 19, 2026
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: 4 additions & 0 deletions src/wasm-interpreter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2254,6 +2254,10 @@ class ExpressionRunner : public OverriddenVisitor<SubType, Flow> {
VISIT(expected, curr->expected)
VISIT(timeout, curr->timeout)

if (!curr->ref->type.getHeapType().isShared()) {
trap("cannot struct.wait a non-shared object");
}

auto data = ref.getSingleValue().getGCData();
if (!data) {
trap("null ref");
Expand Down
15 changes: 14 additions & 1 deletion test/spec/waitqueue.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
)

(module
(type $t (struct (field (mut waitqueue))))
(type $t (shared (struct (field (mut waitqueue)))))
Copy link
Copy Markdown
Member

@tlively tlively Mar 19, 2026

Choose a reason for hiding this comment

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

It would be good to at least add a TODO for adding a test for the trap-on-unshared behavior.

Copy link
Copy Markdown
Member Author

@kripken kripken Mar 19, 2026

Choose a reason for hiding this comment

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

I added a full spec test and removed the exec test.


(global $g (mut (ref null $t)) (struct.new $t (i32.const 0)))

Expand Down Expand Up @@ -117,3 +117,16 @@

(assert_trap (invoke "struct.wait" (i32.const 0) (i64.const 0)) "null ref")
(assert_trap (invoke "struct.notify" (i32.const 0)) "null ref")

;; Waiting on a non-shared struct should trap.
(module
(type $t (struct (field (mut waitqueue))))

(global $g (mut (ref null $t)) (struct.new $t (i32.const 0)))

(func (export "struct.wait") (param $expected i32) (param $timeout i64) (result i32)
(struct.wait $t 0 (global.get $g) (local.get $expected) (local.get $timeout))
)
)
(assert_trap (invoke "struct.wait" (i32.const 0) (i64.const 100)) "not shared")

Loading