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
18 changes: 9 additions & 9 deletions test/wasmtime/fused.wast
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@
(instance $c1 (instantiate $c1))
(instance $c2 (instantiate $c2 (with "r" (func $c1 "r"))))
)
"unreachable")
"unaligned pointer")

;; caller retptr misaligned
(assert_trap
Expand Down Expand Up @@ -538,7 +538,7 @@
(instance $c1 (instantiate $c1))
(instance $c2 (instantiate $c2 (with "r" (func $c1 "r"))))
)
"unreachable")
"unaligned pointer")

;; callee argptr misaligned
(assert_trap
Expand Down Expand Up @@ -586,7 +586,7 @@
(instance $c1 (instantiate $c1))
(instance $c2 (instantiate $c2 (with "r" (func $c1 "r"))))
)
"unreachable")
"unaligned pointer")

;; caller argptr misaligned
(assert_trap
Expand Down Expand Up @@ -635,7 +635,7 @@
(instance $c1 (instantiate $c1))
(instance $c2 (instantiate $c2 (with "r" (func $c1 "r"))))
)
"unreachable")
"unaligned pointer")

;; simple variant translation
(component
Expand Down Expand Up @@ -722,7 +722,7 @@
(with "r" (func $c1 "r"))
))
)
"unreachable")
"invalid variant discriminant")

;; invalid variant discriminant in a result
(assert_trap
Expand Down Expand Up @@ -757,7 +757,7 @@
(with "r" (func $c1 "r"))
))
)
"unreachable")
"invalid variant discriminant")


;; extra bits are chopped off
Expand Down Expand Up @@ -1160,7 +1160,7 @@
(instance $c1 (instantiate $c1))
(instance $c2 (instantiate $c2 (with "a" (instance $c1))))
)
"unreachable")
"invalid `char` bit pattern")
(assert_trap
(component
(component $c1
Expand All @@ -1181,7 +1181,7 @@
(instance $c1 (instantiate $c1))
(instance $c2 (instantiate $c2 (with "a" (instance $c1))))
)
"unreachable")
"invalid `char` bit pattern")
(assert_trap
(component
(component $c1
Expand All @@ -1202,7 +1202,7 @@
(instance $c1 (instantiate $c1))
(instance $c2 (instantiate $c2 (with "a" (instance $c1))))
)
"unreachable")
"invalid `char` bit pattern")

;; test that flags get their upper bits all masked off
(component
Expand Down
2 changes: 1 addition & 1 deletion test/wasmtime/resources.wast
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@
(func (export "f") (canon lift (core func $i "f")))
)

(assert_trap (invoke "f") "unknown handle index 1")
(assert_trap (invoke "f") "index 1 is not a resource")

;; Each instantiation of a component generates a unique resource type, so
;; allocating in one component and deallocating in another should fail.
Expand Down
6 changes: 3 additions & 3 deletions test/wasmtime/strings.wast
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
(instance $c (instantiate $c))
(instance $c2 (instantiate $c2 (with "a" (func $c "a"))))
)
"unreachable")
"unaligned pointer")

;; unaligned latin1+utf16 string, even with the latin1 encoding
(assert_trap
Expand Down Expand Up @@ -70,7 +70,7 @@
(instance $c (instantiate $c))
(instance $c2 (instantiate $c2 (with "a" (func $c "a"))))
)
"unreachable")
"unaligned pointer")

;; out of bounds utf8->utf8 string
(assert_trap
Expand Down Expand Up @@ -107,4 +107,4 @@
(instance $c (instantiate $c))
(instance $c2 (instantiate $c2 (with "a" (func $c "a"))))
)
"unreachable")
"string content out-of-bounds")