Skip to content

Validate RMW field types #8554

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 1 commit into from
Mar 31, 2026
+67 −0
Merged

Validate RMW field types #8554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions src/wasm/wasm-validator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3574,6 +3574,10 @@ void FunctionValidator::visitStructCmpxchg(StructCmpxchg* curr) {
} else if (field.type.isRef()) {
expectedExpectedType = Type(
HeapTypes::eq.getBasic(field.type.getHeapType().getShared()), Nullable);
shouldBeSubType(field.type,
expectedExpectedType,
curr,
"struct.atomic.rmw field type invalid for operation");
} else {
shouldBeTrue(
false, curr, "struct.atomic.rmw field type invalid for operation");
Expand Down Expand Up @@ -4127,6 +4131,10 @@ void FunctionValidator::visitArrayCmpxchg(ArrayCmpxchg* curr) {
} else if (element.type.isRef()) {
expectedExpectedType = Type(
HeapTypes::eq.getBasic(element.type.getHeapType().getShared()), Nullable);
shouldBeSubType(element.type,
expectedExpectedType,
curr,
"array.atomic.rmw element type invalid for operation");
} else {
shouldBeTrue(
false, curr, "array.atomic.rmw element type invalid for operation");
Expand Down
59 changes: 59 additions & 0 deletions test/lit/validation/cmpxchg.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
;; RUN: not wasm-opt %s -all 2>&1 | filecheck %s

(module
;; Shared types
(type $struct-any (shared (struct (field (mut (ref null (shared any)))))))
(type $array-any (shared (array (mut (ref null (shared any))))))

;; Negative cases for struct.atomic.rmw.cmpxchg
;; Use eqref for expected and replacement to isolate the error to the field type.
(func $struct-cmpxchg-anyref (param $ref (ref $struct-any)) (param $eq (ref null (shared eq)))
(drop
(struct.atomic.rmw.cmpxchg $struct-any 0
(local.get $ref)
(local.get $eq)
(local.get $eq)
)
)
)
;; CHECK: [wasm-validator error in function struct-cmpxchg-anyref] struct.atomic.rmw field type invalid for operation

;; Negative case for array.atomic.rmw.cmpxchg
(func $array-cmpxchg-anyref (param $ref (ref $array-any)) (param $eq (ref null (shared eq)))
(drop
(array.atomic.rmw.cmpxchg $array-any
(local.get $ref)
(i32.const 0)
(local.get $eq)
(local.get $eq)
)
)
)
;; CHECK: [wasm-validator error in function array-cmpxchg-anyref] array.atomic.rmw element type invalid for operation

;; Unshared types
(type $struct-unshared-any (struct (field (mut anyref))))
(func $struct-cmpxchg-unshared-anyref (param $ref (ref $struct-unshared-any)) (param $eq eqref)
(drop
(struct.atomic.rmw.cmpxchg $struct-unshared-any 0
(local.get $ref)
(local.get $eq)
(local.get $eq)
)
)
)
;; CHECK: [wasm-validator error in function struct-cmpxchg-unshared-anyref] struct.atomic.rmw field type invalid for operation

;; Check that it still fails for non-i32/i64/reference types.
(type $struct-v128 (struct (field (mut v128))))
(func $struct-cmpxchg-v128 (param $ref (ref $struct-v128)) (param $eq v128)
(drop
(struct.atomic.rmw.cmpxchg $struct-v128 0
(local.get $ref)
(local.get $eq)
(local.get $eq)
)
)
)
;; CHECK: [wasm-validator error in function struct-cmpxchg-v128] unexpected false: struct.atomic.rmw field type invalid for operation
)
Loading