Skip to content

Fix printing of bulk array ops #6387

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
merged 1 commit into from
Mar 8, 2024
Merged

Fix printing of bulk array ops #6387

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
19 changes: 19 additions & 0 deletions src/passes/Print.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,25 @@ struct PrintSExpression : public UnifiedExpressionVisitor<PrintSExpression> {
void visitArrayGet(ArrayGet* curr) {
maybePrintUnreachableOrNullReplacement(curr, curr->ref->type);
}
void visitArrayCopy(ArrayCopy* curr) {
if (curr->srcRef->type == Type::unreachable ||
curr->destRef->type == Type::unreachable ||
curr->srcRef->type.isNull() || curr->destRef->type.isNull()) {
maybePrintUnreachableOrNullReplacement(curr, Type::unreachable);
return;
}
visitExpression(curr);
}
void visitArrayFill(ArrayFill* curr) {
maybePrintUnreachableOrNullReplacement(curr, curr->ref->type);
}
void visitArrayInitData(ArrayInitData* curr) {
maybePrintUnreachableOrNullReplacement(curr, curr->ref->type);
}
void visitArrayInitElem(ArrayInitElem* curr) {
maybePrintUnreachableOrNullReplacement(curr, curr->ref->type);
}

// Module-level visitors
void handleSignature(HeapType curr, Name name = Name());
void visitExport(Export* curr);
Expand Down
17 changes: 13 additions & 4 deletions test/lit/passes/gufa-refs.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5632,11 +5632,20 @@
(data $0 "")

;; CHECK: (func $test (type $0)
;; CHECK-NEXT: (block
;; CHECK-NEXT: (block ;; (replaces unreachable ArrayInitData we can't emit)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 1)
;; CHECK-NEXT: )
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (i32.const 1)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $test
Expand Down
126 changes: 93 additions & 33 deletions test/lit/passes/type-generalizing.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1383,12 +1383,23 @@
;; CHECK: (func $array-copy-impossible-dest (type $0)
;; CHECK-NEXT: (local $dest nullref)
;; CHECK-NEXT: (local $src anyref)
;; CHECK-NEXT: (block
;; CHECK-NEXT: (local.get $dest)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (local.get $src)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (block ;; (replaces unreachable ArrayCopy we can't emit)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (local.get $dest)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (local.get $src)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $array-copy-impossible-dest
Expand All @@ -1408,12 +1419,23 @@
;; CHECK: (func $array-copy-impossible-src (type $0)
;; CHECK-NEXT: (local $dest anyref)
;; CHECK-NEXT: (local $src nullref)
;; CHECK-NEXT: (block
;; CHECK-NEXT: (local.get $dest)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (local.get $src)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (block ;; (replaces unreachable ArrayCopy we can't emit)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (local.get $dest)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (local.get $src)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $array-copy-impossible-src
Expand All @@ -1433,12 +1455,23 @@
;; CHECK: (func $array-copy-impossible-both (type $0)
;; CHECK-NEXT: (local $dest nullref)
;; CHECK-NEXT: (local $src nullref)
;; CHECK-NEXT: (block
;; CHECK-NEXT: (local.get $dest)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (local.get $src)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (block ;; (replaces unreachable ArrayCopy we can't emit)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (local.get $dest)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (local.get $src)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $array-copy-impossible-both
Expand Down Expand Up @@ -1481,11 +1514,20 @@
;; CHECK: (func $array-fill-impossible (type $0)
;; CHECK-NEXT: (local $ref nullref)
;; CHECK-NEXT: (local $val anyref)
;; CHECK-NEXT: (block
;; CHECK-NEXT: (local.get $ref)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (local.get $val)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (block ;; (replaces unreachable ArrayFill we can't emit)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (local.get $ref)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (local.get $val)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $array-fill-impossible
Expand Down Expand Up @@ -1522,11 +1564,20 @@

;; CHECK: (func $array-init-data-impossible (type $0)
;; CHECK-NEXT: (local $ref nullref)
;; CHECK-NEXT: (block
;; CHECK-NEXT: (local.get $ref)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (block ;; (replaces unreachable ArrayInitData we can't emit)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (local.get $ref)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $array-init-data-impossible
Expand Down Expand Up @@ -1562,11 +1613,20 @@

;; CHECK: (func $array-init-elem-impossible (type $0)
;; CHECK-NEXT: (local $ref nullref)
;; CHECK-NEXT: (block
;; CHECK-NEXT: (local.get $ref)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (block ;; (replaces unreachable ArrayInitElem we can't emit)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (local.get $ref)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $array-init-elem-impossible
Expand Down
116 changes: 87 additions & 29 deletions test/lit/passes/unsubtyping.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1441,19 +1441,41 @@
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (block
;; CHECK-NEXT: (block ;; (replaces unreachable ArrayCopy we can't emit)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (array.new_fixed $sub-array 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (array.new_fixed $sub-array 0)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (block
;; CHECK-NEXT: (array.new_fixed $super-array 0)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (ref.null none)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (block ;; (replaces unreachable ArrayCopy we can't emit)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (array.new_fixed $super-array 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (ref.null none)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $array-copy
Expand Down Expand Up @@ -1503,17 +1525,35 @@
;; CHECK-NEXT: (struct.new_default $sub)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (block
;; CHECK-NEXT: (block ;; (replaces unreachable ArrayFill we can't emit)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (struct.new_default $sub)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (struct.new_default $sub)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (block
;; CHECK-NEXT: (ref.null none)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (struct.new_default $sub)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (block ;; (replaces unreachable ArrayFill we can't emit)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (ref.null none)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (struct.new_default $sub)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $array-fill
Expand Down Expand Up @@ -1564,17 +1604,35 @@
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (block
;; CHECK-NEXT: (block ;; (replaces unreachable ArrayInitElem we can't emit)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (block
;; CHECK-NEXT: (ref.null none)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: (block ;; (replaces unreachable ArrayInitElem we can't emit)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (ref.null none)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $array-init-elem
Expand Down