Skip to content

Commit

Permalink
[threads] Fix shared ref.eq and disallow mixed-shareability (#6763)
Browse files Browse the repository at this point in the history 
Update the validator to reject mixed-shareability ref.eq, although this
is still under discussion in
WebAssembly/shared-everything-threads#76. Fix
the implementation of `Literal::operator==` to work properly with shared
i31ref.
  • Loading branch information
@tlively
tlively authored Jul 17, 2024
1 parent 1e7be1e commit 1434591
Show file tree
Hide file tree
Showing 5 changed files with 211 additions and 3 deletions.
1 change: 1 addition & 0 deletions scripts/fuzz_opt.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,7 @@ def is_git_repo():
'shared-null.wast',
'shared-absheaptype.wast',
'type-ssa-shared.wast',
'shared-ref_eq.wast',
]


Expand Down
3 changes: 2 additions & 1 deletion src/wasm/literal.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,8 @@ bool Literal::operator==(const Literal& other) const {
if (type.isData()) {
return gcData == other.gcData;
}
if (type.getHeapType() == HeapType::i31) {
assert(type.getHeapType().isBasic());
if (type.getHeapType().getBasic(Unshared) == HeapType::i31) {
return i32 == other.i32;
}
WASM_UNREACHABLE("unexpected type");
Expand Down
6 changes: 6 additions & 0 deletions src/wasm/wasm-validator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2306,6 +2306,12 @@ void FunctionValidator::visitRefEq(RefEq* curr) {
eqref,
curr->right,
"ref.eq's right argument should be a subtype of eqref");
if (curr->left->type.isRef() && curr->right->type.isRef()) {
shouldBeEqual(curr->left->type.getHeapType().getShared(),
curr->right->type.getHeapType().getShared(),
curr,
"ref.eq operands must have the same shareability");
}
}

void FunctionValidator::visitTableGet(TableGet* curr) {
Expand Down
2 changes: 0 additions & 2 deletions test/spec/shared-polymorphism.wast
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
;; references.
(module
(func (drop (ref.eq (ref.null (shared none)) (ref.null (shared none)))))
(func (drop (ref.eq (ref.null (shared none)) (ref.null none))))
(func (drop (ref.eq (ref.null none) (ref.null (shared none)))))

(func (param (ref null (shared i31))) (drop (i31.get_s (local.get 0))))
(func (param (ref null (shared i31))) (drop (i31.get_u (local.get 0))))
Expand Down
202 changes: 202 additions & 0 deletions test/spec/shared-ref_eq.wast
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@
(module
(type $st (sub (shared (struct))))
(type $st' (sub (shared (struct (field i32)))))
(type $at (shared (array i8)))
(type $st-sub1 (sub $st (shared (struct))))
(type $st-sub2 (sub $st (shared (struct))))
(type $st'-sub1 (sub $st' (shared (struct (field i32)))))
(type $st'-sub2 (sub $st' (shared (struct (field i32)))))

(table 20 (ref null (shared eq)))

(func (export "init")
(table.set (i32.const 0) (ref.null (shared eq)))
(table.set (i32.const 1) (ref.null (shared i31)))
(table.set (i32.const 2) (ref.i31_shared (i32.const 7)))
(table.set (i32.const 3) (ref.i31_shared (i32.const 7)))
(table.set (i32.const 4) (ref.i31_shared (i32.const 8)))
(table.set (i32.const 5) (struct.new_default $st))
(table.set (i32.const 6) (struct.new_default $st))
(table.set (i32.const 7) (array.new_default $at (i32.const 0)))
(table.set (i32.const 8) (array.new_default $at (i32.const 0)))
)

(func (export "eq") (param $i i32) (param $j i32) (result i32)
(ref.eq (table.get (local.get $i)) (table.get (local.get $j)))
)
)

(invoke "init")

(assert_return (invoke "eq" (i32.const 0) (i32.const 0)) (i32.const 1))
(assert_return (invoke "eq" (i32.const 0) (i32.const 1)) (i32.const 1))
(assert_return (invoke "eq" (i32.const 0) (i32.const 2)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 0) (i32.const 3)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 0) (i32.const 4)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 0) (i32.const 5)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 0) (i32.const 6)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 0) (i32.const 7)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 0) (i32.const 8)) (i32.const 0))

(assert_return (invoke "eq" (i32.const 1) (i32.const 0)) (i32.const 1))
(assert_return (invoke "eq" (i32.const 1) (i32.const 1)) (i32.const 1))
(assert_return (invoke "eq" (i32.const 1) (i32.const 2)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 1) (i32.const 3)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 1) (i32.const 4)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 1) (i32.const 5)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 1) (i32.const 6)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 1) (i32.const 7)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 1) (i32.const 8)) (i32.const 0))

(assert_return (invoke "eq" (i32.const 2) (i32.const 0)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 2) (i32.const 1)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 2) (i32.const 2)) (i32.const 1))
(assert_return (invoke "eq" (i32.const 2) (i32.const 3)) (i32.const 1))
(assert_return (invoke "eq" (i32.const 2) (i32.const 4)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 2) (i32.const 5)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 2) (i32.const 6)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 2) (i32.const 7)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 2) (i32.const 8)) (i32.const 0))

(assert_return (invoke "eq" (i32.const 3) (i32.const 0)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 3) (i32.const 1)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 3) (i32.const 2)) (i32.const 1))
(assert_return (invoke "eq" (i32.const 3) (i32.const 3)) (i32.const 1))
(assert_return (invoke "eq" (i32.const 3) (i32.const 4)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 3) (i32.const 5)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 3) (i32.const 6)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 3) (i32.const 7)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 3) (i32.const 8)) (i32.const 0))

(assert_return (invoke "eq" (i32.const 4) (i32.const 0)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 4) (i32.const 1)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 4) (i32.const 2)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 4) (i32.const 3)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 4) (i32.const 4)) (i32.const 1))
(assert_return (invoke "eq" (i32.const 4) (i32.const 5)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 4) (i32.const 6)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 4) (i32.const 7)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 4) (i32.const 8)) (i32.const 0))

(assert_return (invoke "eq" (i32.const 5) (i32.const 0)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 5) (i32.const 1)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 5) (i32.const 2)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 5) (i32.const 3)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 5) (i32.const 4)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 5) (i32.const 5)) (i32.const 1))
(assert_return (invoke "eq" (i32.const 5) (i32.const 6)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 5) (i32.const 7)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 5) (i32.const 8)) (i32.const 0))

(assert_return (invoke "eq" (i32.const 6) (i32.const 0)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 6) (i32.const 1)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 6) (i32.const 2)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 6) (i32.const 3)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 6) (i32.const 4)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 6) (i32.const 5)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 6) (i32.const 6)) (i32.const 1))
(assert_return (invoke "eq" (i32.const 6) (i32.const 7)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 6) (i32.const 8)) (i32.const 0))

(assert_return (invoke "eq" (i32.const 7) (i32.const 0)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 7) (i32.const 1)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 7) (i32.const 2)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 7) (i32.const 3)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 7) (i32.const 4)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 7) (i32.const 5)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 7) (i32.const 6)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 7) (i32.const 7)) (i32.const 1))
(assert_return (invoke "eq" (i32.const 7) (i32.const 8)) (i32.const 0))

(assert_return (invoke "eq" (i32.const 8) (i32.const 0)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 8) (i32.const 1)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 8) (i32.const 2)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 8) (i32.const 3)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 8) (i32.const 4)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 8) (i32.const 5)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 8) (i32.const 6)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 8) (i32.const 7)) (i32.const 0))
(assert_return (invoke "eq" (i32.const 8) (i32.const 8)) (i32.const 1))

(assert_invalid
(module
(func (export "eq") (param $r (ref (shared any))) (result i32)
(ref.eq (local.get $r) (local.get $r))
)
)
"type mismatch"
)
(assert_invalid
(module
(func (export "eq") (param $r (ref null (shared any))) (result i32)
(ref.eq (local.get $r) (local.get $r))
)
)
"type mismatch"
)
(assert_invalid
(module
(func (export "eq") (param $r (ref null (shared func))) (result i32)
(ref.eq (local.get $r) (local.get $r))
)
)
"type mismatch"
)
(assert_invalid
(module
(func (export "eq") (param $r (ref null (shared func))) (result i32)
(ref.eq (local.get $r) (local.get $r))
)
)
"type mismatch"
)
(assert_invalid
(module
(func (export "eq") (param $r (ref (shared extern))) (result i32)
(ref.eq (local.get $r) (local.get $r))
)
)
"type mismatch"
)
(assert_invalid
(module
(func (export "eq") (param $r (ref null (shared extern))) (result i32)
(ref.eq (local.get $r) (local.get $r))
)
)
"type mismatch"
)

;; Mixed shared / unshared eq
(assert_invalid
(module
(func (export "eq") (param $r1 (ref eq)) (param $r2 (ref (shared eq))) (result i32)
(ref.eq (local.get $r1) (local.get $r2))
)
)
"type mismatch"
)
(assert_invalid
(module
(func (export "eq") (param $r1 (ref (shared eq))) (param $r2 (ref eq)) (result i32)
(ref.eq (local.get $r1) (local.get $r2))
)
)
"type mismatch"
)
(assert_invalid
(module
(func (export "eq") (param $r1 eqref) (param $r2 (ref null (shared eq))) (result i32)
(ref.eq (local.get $r1) (local.get $r2))
)
)
"type mismatch"
)
(assert_invalid
(module
(func (export "eq") (param $r1 (ref null (shared eq))) (param $r2 eqref) (result i32)
(ref.eq (local.get $r1) (local.get $r2))
)
)
"type mismatch"
)

0 comments on commit 1434591

Please sign in to comment.