Skip to content

Validate features for types used in element segments #6769

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
Jul 18, 2024
Merged

Validate features for types used in element segments #6769

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
1 change: 1 addition & 0 deletions scripts/fuzz_opt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,7 @@ def is_git_repo():
'shared-types-no-gc.wast',
'shared-ref-i31.wast',
'table-type.wast',
'elem-type.wast',
]


Expand Down
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 @@ -3877,6 +3877,14 @@ static void validateTables(Module& module, ValidationInfo& info) {
segment->type.isNullable(),
"elem",
"Non-nullable reference types are not yet supported for tables");
auto typeFeats = segment->type.getFeatures();
if (!info.shouldBeTrue(
segment->type == funcref || typeFeats <= module.features,
"elem",
"element segment type requires additional features")) {
info.getStream(nullptr)
<< getMissingFeaturesList(module, typeFeats) << '\n';
}

bool isPassive = !segment->table.is();
if (isPassive) {
Expand Down
12 changes: 12 additions & 0 deletions test/lit/validation/elem-type.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
;; Test that the features required by element segment types are checked

;; RUN: not wasm-opt %s -all --disable-shared-everything 2>&1 | filecheck %s --check-prefix NO-SHARED
;; RUN: wasm-opt %s -all -S -o - | filecheck %s --check-prefix SHARED

;; NO-SHARED: element segment type requires additional features
;; NO-SHARED: [--enable-shared-everything]
;; SHARED: (elem $e (ref null (shared func)))

(module
(elem $e (ref null (shared func)))
)