Skip to content

Fix feature set checking for GC RMWs #8480

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 18, 2026
Merged

Fix feature set checking for GC RMWs #8480

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
4 changes: 2 additions & 2 deletions src/wasm-features.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,12 +217,12 @@ struct FeatureSet {
}
}

bool operator<=(const FeatureSet& other) const {
bool isSubsetOf(const FeatureSet& other) const {
return !(features & ~other.features);
}

bool operator==(const FeatureSet& other) const {
return *this <= other && other <= *this;
return isSubsetOf(other) && other.isSubsetOf(*this);
}

bool operator!=(const FeatureSet& other) const { return !(*this == other); }
Expand Down
41 changes: 21 additions & 20 deletions src/wasm/wasm-validator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,7 +748,7 @@ void FunctionValidator::validatePoppyExpression(Expression* curr) {

void FunctionValidator::visitBlock(Block* curr) {
auto feats = curr->type.getFeatures();
if (!shouldBeTrue(feats <= getModule()->features,
if (!shouldBeTrue(feats.isSubsetOf(getModule()->features),
curr,
"Block type requires additional features")) {
getStream() << getMissingFeaturesList(*getModule(), feats) << '\n';
Expand Down Expand Up @@ -1133,7 +1133,7 @@ void FunctionValidator::visitCallIndirect(CallIndirect* curr) {
}

void FunctionValidator::visitConst(Const* curr) {
shouldBeTrue(curr->type.getFeatures() <= getModule()->features,
shouldBeTrue(curr->type.getFeatures().isSubsetOf(getModule()->features),
curr,
"all used features should be allowed");
}
Expand Down Expand Up @@ -1592,7 +1592,7 @@ void FunctionValidator::visitSIMDTernary(SIMDTernary* curr) {
required |= FeatureSet::SIMD;
break;
}
if (!shouldBeTrue(required <= getModule()->features,
if (!shouldBeTrue(required.isSubsetOf(getModule()->features),
curr,
"SIMD ternary operation requires additional features")) {
getStream() << getMissingFeaturesList(*getModule(), required) << '\n';
Expand Down Expand Up @@ -2099,7 +2099,7 @@ void FunctionValidator::visitBinary(Binary* curr) {
case InvalidBinary:
WASM_UNREACHABLE("invliad binary op");
}
shouldBeTrue(Features::get(curr->op) <= getModule()->features,
shouldBeTrue(Features::get(curr->op).isSubsetOf(getModule()->features),
curr,
"all used features should be allowed");
}
Expand Down Expand Up @@ -2406,7 +2406,7 @@ void FunctionValidator::visitUnary(Unary* curr) {
case InvalidUnary:
WASM_UNREACHABLE("invalid unary op");
}
shouldBeTrue(Features::get(curr->op) <= getModule()->features,
shouldBeTrue(Features::get(curr->op).isSubsetOf(getModule()->features),
curr,
"all used features should be allowed");
}
Expand Down Expand Up @@ -2490,7 +2490,7 @@ void FunctionValidator::visitRefNull(RefNull* curr) {
// allow RefNull there as we represent tables that way regardless of what
// features are enabled.
auto feats = curr->type.getFeatures();
if (!shouldBeTrue(!getFunction() || feats <= getModule()->features,
if (!shouldBeTrue(!getFunction() || feats.isSubsetOf(getModule()->features),
curr,
"ref.null requires additional features ")) {
getStream() << getMissingFeaturesList(*getModule(), feats) << '\n';
Expand Down Expand Up @@ -3490,9 +3490,9 @@ void FunctionValidator::visitStructSet(StructSet* curr) {
}

void FunctionValidator::visitStructRMW(StructRMW* curr) {
auto expected =
FeatureSet expected =
FeatureSet::GC | FeatureSet::Atomics | FeatureSet::SharedEverything;
if (!shouldBeTrue(expected <= getModule()->features,
if (!shouldBeTrue(expected.isSubsetOf(getModule()->features),
curr,
"struct.atomic.rmw requires additional features ")) {
getStream() << getMissingFeaturesList(*getModule(), expected) << '\n';
Expand Down Expand Up @@ -3542,9 +3542,9 @@ void FunctionValidator::visitStructRMW(StructRMW* curr) {
}

void FunctionValidator::visitStructCmpxchg(StructCmpxchg* curr) {
auto expected =
FeatureSet expected =
FeatureSet::GC | FeatureSet::Atomics | FeatureSet::SharedEverything;
if (!shouldBeTrue(expected <= getModule()->features,
if (!shouldBeTrue(expected.isSubsetOf(getModule()->features),
curr,
"struct.atomic.rmw requires additional features ")) {
getStream() << getMissingFeaturesList(*getModule(), expected) << '\n';
Expand Down Expand Up @@ -3998,9 +3998,9 @@ void FunctionValidator::visitArrayInitElem(ArrayInitElem* curr) {
}

void FunctionValidator::visitArrayRMW(ArrayRMW* curr) {
auto expected =
FeatureSet expected =
FeatureSet::GC | FeatureSet::Atomics | FeatureSet::SharedEverything;
if (!shouldBeTrue(expected <= getModule()->features,
if (!shouldBeTrue(expected.isSubsetOf(getModule()->features),
curr,
"array.atomic.rmw requires additional features ")) {
getStream() << getMissingFeaturesList(*getModule(), expected) << '\n';
Expand Down Expand Up @@ -4047,9 +4047,9 @@ void FunctionValidator::visitArrayRMW(ArrayRMW* curr) {
}

void FunctionValidator::visitArrayCmpxchg(ArrayCmpxchg* curr) {
auto expected =
FeatureSet expected =
FeatureSet::GC | FeatureSet::Atomics | FeatureSet::SharedEverything;
if (!shouldBeTrue(expected <= getModule()->features,
if (!shouldBeTrue(expected.isSubsetOf(getModule()->features),
curr,
"array.atomic.rmw requires additional features ")) {
getStream() << getMissingFeaturesList(*getModule(), expected) << '\n';
Expand Down Expand Up @@ -4681,7 +4681,7 @@ void FunctionValidator::visitFunction(Function* curr) {
for (const auto& var : curr->vars) {
features |= var.getFeatures();
}
shouldBeTrue(features <= getModule()->features,
shouldBeTrue(features.isSubsetOf(getModule()->features),
curr->name,
"all used types should be allowed");

Expand Down Expand Up @@ -4958,7 +4958,7 @@ void validateExports(Module& module, ValidationInfo& info) {
void validateGlobals(Module& module, ValidationInfo& info) {
std::unordered_set<Global*> seen;
ModuleUtils::iterDefinedGlobals(module, [&](Global* curr) {
info.shouldBeTrue(curr->type.getFeatures() <= module.features,
info.shouldBeTrue(curr->type.getFeatures().isSubsetOf(module.features),
curr->name,
"all used types should be allowed");
info.shouldBeTrue(
Expand Down Expand Up @@ -4993,7 +4993,8 @@ void validateGlobals(Module& module, ValidationInfo& info) {
// Check that globals have allowed types.
for (auto& g : module.globals) {
auto globalFeats = g->type.getFeatures();
if (!info.shouldBeTrue(globalFeats <= module.features, g->name, "")) {
if (!info.shouldBeTrue(
globalFeats.isSubsetOf(module.features), g->name, "")) {
info.getStream(nullptr)
<< "global type requires additional features "
<< getMissingFeaturesList(module, globalFeats) << '\n';
Expand Down Expand Up @@ -5129,7 +5130,7 @@ void validateTables(Module& module, ValidationInfo& info) {
"Non-nullable reference types are not yet supported for tables");
auto typeFeats = table->type.getFeatures();
if (!info.shouldBeTrue(table->type == funcref ||
typeFeats <= module.features,
typeFeats.isSubsetOf(module.features),
"table",
"table type requires additional features ")) {
info.getStream(nullptr)
Expand All @@ -5152,7 +5153,7 @@ void validateTables(Module& module, ValidationInfo& info) {
"Non-nullable reference types are not yet supported for tables");
auto typeFeats = segment->type.getFeatures();
if (!info.shouldBeTrue(
segment->type == funcref || typeFeats <= module.features,
segment->type == funcref || typeFeats.isSubsetOf(module.features),
"elem",
"element segment type requires additional features ")) {
info.getStream(nullptr)
Expand Down Expand Up @@ -5224,7 +5225,7 @@ void validateTags(Module& module, ValidationInfo& info) {
curr->name,
"Values in a tag should have concrete types");
}
info.shouldBeTrue(features <= module.features,
info.shouldBeTrue(features.isSubsetOf(module.features),
curr->name,
"all param types in tags should be allowed");
}
Expand Down
59 changes: 59 additions & 0 deletions test/lit/validation/struct-atomic-threads.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 --enable-gc --enable-shared-everything --enable-reference-types --disable-threads 2>&1 | filecheck %s
;; RUN: wasm-opt %s --enable-gc --enable-shared-everything --enable-reference-types --enable-threads

(module
(type $struct (struct (field (mut i32))))
(type $array (array (mut i32)))

(func $struct-cmpxchg (param $ref (ref $struct)) (param $expected i32) (param $replacement i32)
(drop
(struct.atomic.rmw.cmpxchg $struct 0
(local.get $ref)
(local.get $expected)
(local.get $replacement)
)
)
)

(func $struct-rmw (param $ref (ref $struct)) (param $value i32)
(drop
(struct.atomic.rmw.add $struct 0
(local.get $ref)
(local.get $value)
)
)
)

(func $array-cmpxchg (param $ref (ref $array)) (param $expected i32) (param $replacement i32)
(drop
(array.atomic.rmw.cmpxchg $array
(local.get $ref)
(i32.const 0)
(local.get $expected)
(local.get $replacement)
)
)
)

(func $array-rmw (param $ref (ref $array)) (param $value i32)
(drop
(array.atomic.rmw.add $array
(local.get $ref)
(i32.const 0)
(local.get $value)
)
)
)
)

;; CHECK: [wasm-validator error in function struct-cmpxchg] unexpected false: struct.atomic.rmw requires additional features , on
;; CHECK: [--enable-threads]

;; CHECK: [wasm-validator error in function struct-rmw] unexpected false: struct.atomic.rmw requires additional features , on
;; CHECK: [--enable-threads]

;; CHECK: [wasm-validator error in function array-cmpxchg] unexpected false: array.atomic.rmw requires additional features , on
;; CHECK: [--enable-threads]

;; CHECK: [wasm-validator error in function array-rmw] unexpected false: array.atomic.rmw requires additional features , on
;; CHECK: [--enable-threads]
Loading