Skip to content

[Strings] Fix finalize() of StringNew on arrays #6511

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
kripken merged 2 commits into from
Apr 18, 2024
Merged

[Strings] Fix finalize() of StringNew on arrays #6511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe422eb
fix
kripken Apr 18, 2024
e403c37
test
kripken Apr 18, 2024
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
4 changes: 3 additions & 1 deletion src/wasm/wasm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1249,7 +1249,9 @@ void RefAs::finalize() {

void StringNew::finalize() {
if (ptr->type == Type::unreachable ||
(length && length->type == Type::unreachable)) {
(length && length->type == Type::unreachable) ||
(start && start->type == Type::unreachable) ||
(end && end->type == Type::unreachable)) {
type = Type::unreachable;
} else {
type = Type(HeapType::string, try_ ? Nullable : NonNullable);
Expand Down
54 changes: 54 additions & 0 deletions test/lit/passes/dce_all-features.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1678,3 +1678,57 @@
)
)
)

(module
;; CHECK: (type $0 (func))

;; CHECK: (func $string.new-start (type $0)
;; CHECK-NEXT: (local $nn (ref any))
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (ref.null none)
;; CHECK-NEXT: )
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
(func $string.new-start
(local $nn (ref any))
(drop
;; This should have unreachable type because a child is unreachable. If we
;; do not detect that then we will end up removing the tee but not the
;; code after it, which means we'd fail to validate due to a non-nullable
;; local used without a set.
(string.new_wtf16_array
(ref.null any)
(local.tee $nn
(unreachable)
)
(block (result i32)
(drop
(local.get $nn)
)
(i32.const 10)
)
)
)
)

;; CHECK: (func $string.new-end (type $0)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (ref.null none)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 10)
;; CHECK-NEXT: )
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
(func $string.new-end
(drop
;; Now the unreachable is at the end. We should still remove the
;; string.new.
(string.new_wtf16_array
(ref.null any)
(i32.const 10)
(unreachable)
)
)
)
)