Skip to content

Clamp down further on error-context feature gate #2364

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
alexcrichton merged 1 commit into from
Oct 27, 2025
Merged

Clamp down further on error-context feature gate #2364

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
23 changes: 15 additions & 8 deletions crates/wasmparser/src/validator/component.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3910,13 +3910,7 @@ impl ComponentState {
) -> Result<ComponentDefinedType> {
match ty {
crate::ComponentDefinedType::Primitive(ty) => {
if ty == crate::PrimitiveValType::ErrorContext && !self.features.cm_error_context()
{
bail!(
offset,
"`error-context` requires the component model error-context feature"
)
}
self.check_primitive_type(ty, offset)?;
Ok(ComponentDefinedType::Primitive(ty))
}
crate::ComponentDefinedType::Record(fields) => {
Expand Down Expand Up @@ -4184,7 +4178,10 @@ impl ComponentState {
offset: usize,
) -> Result<ComponentValType> {
Ok(match ty {
crate::ComponentValType::Primitive(pt) => ComponentValType::Primitive(pt),
crate::ComponentValType::Primitive(pt) => {
self.check_primitive_type(pt, offset)?;
ComponentValType::Primitive(pt)
}
crate::ComponentValType::Type(idx) => {
ComponentValType::Type(self.defined_type_at(idx, offset)?)
}
Expand Down Expand Up @@ -4470,6 +4467,16 @@ impl ComponentState {
}
Ok(())
}

fn check_primitive_type(&self, ty: crate::PrimitiveValType, offset: usize) -> Result<()> {
if ty == crate::PrimitiveValType::ErrorContext && !self.features.cm_error_context() {
bail!(
offset,
"`error-context` requires the component model error-context feature"
)
}
Ok(())
}
}

impl InternRecGroup for ComponentState {
Expand Down
8 changes: 8 additions & 0 deletions tests/cli/missing-features/component-model/error-context.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
;; RUN: wast --assert default --snapshot tests/snapshots % -f=-cm-error-context

;; error-context.new
(assert_invalid
(component
(import "x" (func (param "x" error-context)))
)
"requires the component model error-context feature"
)

;; error-context.new
(assert_invalid
(component
Expand Down
19 changes: 13 additions & 6 deletions tests/snapshots/cli/missing-features/component-model/error-context.wast.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,34 @@
"line": 5,
"filename": "error-context.0.wasm",
"module_type": "binary",
"text": "`error-context.new` requires the component model error-context feature"
"text": "requires the component model error-context feature"
},
{
"type": "assert_invalid",
"line": 19,
"line": 13,
"filename": "error-context.1.wasm",
"module_type": "binary",
"text": "`error-context.debug-message` requires the component model error-context feature"
"text": "`error-context.new` requires the component model error-context feature"
},
{
"type": "assert_invalid",
"line": 36,
"line": 27,
"filename": "error-context.2.wasm",
"module_type": "binary",
"text": "`error-context.drop` requires the component model error-context feature"
"text": "`error-context.debug-message` requires the component model error-context feature"
},
{
"type": "assert_invalid",
"line": 48,
"line": 44,
"filename": "error-context.3.wasm",
"module_type": "binary",
"text": "`error-context.drop` requires the component model error-context feature"
},
{
"type": "assert_invalid",
"line": 56,
"filename": "error-context.4.wasm",
"module_type": "binary",
"text": "requires the component model error-context feature"
}
]
Expand Down