Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions src/wasm/wasm-validator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1943,9 +1943,6 @@ static void validateEvents(Module& module, ValidationInfo& info) {
FunctionType* ft = module.getFunctionType(curr->type);
info.shouldBeEqual(
ft->result, none, curr->name, "Event type's result type should be none");
info.shouldBeTrue(!curr->params.empty(),
curr->name,
"There should be 1 or more values in an event type");
info.shouldBeEqual(curr->attribute,
(unsigned)0,
curr->attribute,
Expand Down
1 change: 1 addition & 0 deletions test/events.wast
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
(module
(event (attr 0) (param i32))
(event $e (attr 0) (param i32 f32))
(event $empty (attr 0))

(event $e-params0 (attr 0) (param i32 f32))
(event $e-params1 (attr 0) (param i32) (param f32))
Expand Down
2 changes: 2 additions & 0 deletions test/events.wast.from-wast
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
(module
(type $FUNCSIG$vi (func (param i32)))
(type $FUNCSIG$vif (func (param i32 f32)))
(type $FUNCSIG$v (func))
(import "env" "im0" (event $e-import (attr 0) (param i32)))
(import "env" "im1" (event $import$event1 (attr 0) (param i32 f32)))
(event $2 (attr 0) (param i32))
(event $e (attr 0) (param i32 f32))
(event $empty (attr 0) (param))
(event $e-params0 (attr 0) (param i32 f32))
(event $e-params1 (attr 0) (param i32 f32))
(event $e-export (attr 0) (param i32))
Expand Down
6 changes: 4 additions & 2 deletions test/events.wast.fromBinary
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
(module
(type $0 (func (param i32)))
(type $1 (func (param i32 f32)))
(type $2 (func))
(import "env" "im0" (event $eimport$0 (attr 0) (param i32)))
(import "env" "im1" (event $eimport$1 (attr 0) (param i32 f32)))
(event $event$0 (attr 0) (param i32))
(event $event$1 (attr 0) (param i32 f32))
(event $event$2 (attr 0) (param i32 f32))
(event $event$2 (attr 0) (param))
(event $event$3 (attr 0) (param i32 f32))
(event $event$4 (attr 0) (param i32))
(event $event$4 (attr 0) (param i32 f32))
(event $event$5 (attr 0) (param i32))
(export "ex1" (event $event$1))
)

6 changes: 4 additions & 2 deletions test/events.wast.fromBinary.noDebugInfo
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
(module
(type $0 (func (param i32)))
(type $1 (func (param i32 f32)))
(type $2 (func))
(import "env" "im0" (event $eimport$0 (attr 0) (param i32)))
(import "env" "im1" (event $eimport$1 (attr 0) (param i32 f32)))
(event $event$0 (attr 0) (param i32))
(event $event$1 (attr 0) (param i32 f32))
(event $event$2 (attr 0) (param i32 f32))
(event $event$2 (attr 0) (param))
(event $event$3 (attr 0) (param i32 f32))
(event $event$4 (attr 0) (param i32))
(event $event$4 (attr 0) (param i32 f32))
(event $event$5 (attr 0) (param i32))
(export "ex1" (event $event$1))
)

5 changes: 0 additions & 5 deletions test/spec/events.wast
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,6 @@
"Event type's result type should be none"
)

(assert_invalid
(module (event $e (attr 0)))
"There should be 1 or more values in an event type"
)

(assert_invalid
(module (event $e (attr 1) (param i32)))
"Currently only attribute 0 is supported"
Expand Down