Skip to content

Commit cc80abd

Browse files
committed
Fix ElemSegment CheckType in shared validator
1 parent 3cfccc8 commit cc80abd

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/shared-validator.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ Result SharedValidator::OnElemSegmentElemType(const Location& loc,
282282
if (elem.is_active) {
283283
// Check that the type of the elem segment matches the table in which
284284
// it is active.
285-
result |= CheckType(loc, elem.table_type, elem_type, "elem segment");
285+
result |= CheckType(loc, elem_type, elem.table_type, "elem segment");
286286
}
287287
elem.element = elem_type;
288288
return result;

test/spec/elem.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ out/test/spec/elem.wast:527: assert_invalid passed:
7171
0000023: error: OnCallExpr callback failed
7272
out/test/spec/elem.wast:585: assert_trap passed: uninitialized table element
7373
out/test/spec/elem.wast:618: assert_invalid passed:
74-
out/test/spec/elem/elem.61.wasm:000001f: error: type mismatch at elem segment. got externref, expected funcref
74+
out/test/spec/elem/elem.61.wasm:000001f: error: type mismatch at elem segment. got funcref, expected externref
7575
000001f: error: OnElemSegmentElemType callback failed
7676
out/test/spec/elem.wast:623: assert_invalid passed:
77-
out/test/spec/elem/elem.62.wasm:0000017: error: type mismatch at elem segment. got funcref, expected externref
77+
out/test/spec/elem/elem.62.wasm:0000017: error: type mismatch at elem segment. got externref, expected funcref
7878
0000017: error: OnElemSegmentElemType callback failed
7979
out/test/spec/elem.wast:628: assert_invalid passed:
8080
out/test/spec/elem/elem.63.wasm:0000032: error: type mismatch at table.init. got funcref, expected externref

test/spec/extended-const/elem.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ out/test/spec/extended-const/elem.wast:536: assert_invalid passed:
7575
0000023: error: OnCallExpr callback failed
7676
out/test/spec/extended-const/elem.wast:594: assert_trap passed: uninitialized table element
7777
out/test/spec/extended-const/elem.wast:627: assert_invalid passed:
78-
out/test/spec/extended-const/elem/elem.62.wasm:000001f: error: type mismatch at elem segment. got externref, expected funcref
78+
out/test/spec/extended-const/elem/elem.62.wasm:000001f: error: type mismatch at elem segment. got funcref, expected externref
7979
000001f: error: OnElemSegmentElemType callback failed
8080
out/test/spec/extended-const/elem.wast:632: assert_invalid passed:
81-
out/test/spec/extended-const/elem/elem.63.wasm:0000017: error: type mismatch at elem segment. got funcref, expected externref
81+
out/test/spec/extended-const/elem/elem.63.wasm:0000017: error: type mismatch at elem segment. got externref, expected funcref
8282
0000017: error: OnElemSegmentElemType callback failed
8383
out/test/spec/extended-const/elem.wast:637: assert_invalid passed:
8484
out/test/spec/extended-const/elem/elem.64.wasm:0000032: error: type mismatch at table.init. got funcref, expected externref

0 commit comments

Comments
 (0)