Skip to content

Fix Unsubtyping on array and struct cmpxchg #8469

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 16, 2026
+94 −4
Merged

Fix Unsubtyping on array and struct cmpxchg #8469

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
16 changes: 12 additions & 4 deletions src/ir/subtype-exprs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,8 +368,12 @@ struct SubtypingDiscoverer : public OverriddenVisitor<SubType> {
}
const auto& fields = curr->ref->type.getHeapType().getStruct().fields;
auto type = fields[curr->index].type;
self()->noteSubtype(curr->expected,
type.isRef() ? Type(HeapType::eq, Nullable) : type);
Type expectedType = type;
if (type.isRef()) {
expectedType =
Type(HeapTypes::eq.getBasic(type.getHeapType().getShared()), Nullable);
}
self()->noteSubtype(curr->expected, expectedType);
self()->noteSubtype(curr->replacement, type);
}
void visitStructWait(StructWait* curr) {}
Expand Down Expand Up @@ -445,8 +449,12 @@ struct SubtypingDiscoverer : public OverriddenVisitor<SubType> {
return;
}
auto type = curr->ref->type.getHeapType().getArray().element.type;
self()->noteSubtype(curr->expected,
type.isRef() ? Type(HeapType::eq, Nullable) : type);
Type expectedType = type;
if (type.isRef()) {
expectedType =
Type(HeapTypes::eq.getBasic(type.getHeapType().getShared()), Nullable);
}
self()->noteSubtype(curr->expected, expectedType);
self()->noteSubtype(curr->replacement, type);
}
void visitRefAs(RefAs* curr) {
Expand Down
82 changes: 82 additions & 0 deletions test/lit/passes/unsubtyping-cmpxchg.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
;; NOTE: Assertions have been generated by update_lit_checks.py and should not be edited.
;; RUN: wasm-opt %s -all --closed-world --unsubtyping -S -o - | filecheck %s

(module
;; CHECK: (rec
;; CHECK-NEXT: (type $array-unshared (array (mut eqref)))

;; CHECK: (type $array-shared (shared (array (mut (ref null (shared eq))))))

;; CHECK: (type $struct-unshared (struct (field (mut eqref))))

;; CHECK: (type $struct-shared (struct (field (mut (ref null (shared eq))))))
(type $struct-shared (struct (field (mut (ref null (shared eq))))))
(type $struct-unshared (struct (field (mut eqref))))

(type $array-shared (shared (array (mut (ref null (shared eq))))))
(type $array-unshared (array (mut eqref)))

;; CHECK: (func $struct-shared-eq (type $7) (param $struct (ref $struct-shared)) (param $eq (ref null (shared eq))) (result (ref null (shared eq)))
;; CHECK-NEXT: (struct.atomic.rmw.cmpxchg $struct-shared 0
;; CHECK-NEXT: (local.get $struct)
;; CHECK-NEXT: (local.get $eq)
;; CHECK-NEXT: (local.get $eq)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $struct-shared-eq (param $struct (ref $struct-shared)) (param $eq (ref null (shared eq))) (result (ref null (shared eq)))
(struct.atomic.rmw.cmpxchg $struct-shared 0
(local.get $struct)
(local.get $eq)
(local.get $eq)
)
)

;; CHECK: (func $struct-unshared-eq (type $6) (param $struct (ref $struct-unshared)) (param $eq eqref) (result eqref)
;; CHECK-NEXT: (struct.atomic.rmw.cmpxchg $struct-unshared 0
;; CHECK-NEXT: (local.get $struct)
;; CHECK-NEXT: (local.get $eq)
;; CHECK-NEXT: (local.get $eq)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $struct-unshared-eq (param $struct (ref $struct-unshared)) (param $eq eqref) (result eqref)
(struct.atomic.rmw.cmpxchg $struct-unshared 0
(local.get $struct)
(local.get $eq)
(local.get $eq)
)
)

;; CHECK: (func $array-shared-eq (type $5) (param $array (ref $array-shared)) (param $eq (ref null (shared eq))) (result (ref null (shared eq)))
;; CHECK-NEXT: (array.atomic.rmw.cmpxchg $array-shared
;; CHECK-NEXT: (local.get $array)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (local.get $eq)
;; CHECK-NEXT: (local.get $eq)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $array-shared-eq (param $array (ref $array-shared)) (param $eq (ref null (shared eq))) (result (ref null (shared eq)))
(array.atomic.rmw.cmpxchg $array-shared
(local.get $array)
(i32.const 0)
(local.get $eq)
(local.get $eq)
)
)

;; CHECK: (func $array-unshared-eq (type $4) (param $array (ref $array-unshared)) (param $eq eqref) (result eqref)
;; CHECK-NEXT: (array.atomic.rmw.cmpxchg $array-unshared
;; CHECK-NEXT: (local.get $array)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (local.get $eq)
;; CHECK-NEXT: (local.get $eq)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $array-unshared-eq (param $array (ref $array-unshared)) (param $eq eqref) (result eqref)
(array.atomic.rmw.cmpxchg $array-unshared
(local.get $array)
(i32.const 0)
(local.get $eq)
(local.get $eq)
)
)
)
Loading