summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/passes/MergeBlocks.cpp27
-rw-r--r--test/lit/passes/merge-blocks.wast9
-rw-r--r--test/lit/passes/monomorphize-drop.wast7
-rw-r--r--test/passes/Oz_fuzz-exec_all-features.txt10
-rw-r--r--test/passes/merge-blocks.txt29
-rw-r--r--test/passes/remove-unused-names_merge-blocks_all-features.txt64
6 files changed, 94 insertions, 52 deletions
diff --git a/src/passes/MergeBlocks.cpp b/src/passes/MergeBlocks.cpp
index 12f67329d..7518c73ca 100644
--- a/src/passes/MergeBlocks.cpp
+++ b/src/passes/MergeBlocks.cpp
@@ -206,6 +206,11 @@ static bool optimizeDroppedBlock(Drop* drop,
PassOptions& options,
BranchUtils::BranchSeekerCache& branchInfo) {
assert(drop->value == block);
+ if (hasUnreachableChild(block)) {
+ // Don't move around unreachable code, as it can change types (leave it for
+ // DCE).
+ return false;
+ }
if (block->name.is()) {
// There may be breaks: see if we can remove their values.
Expression* expression = block;
@@ -261,20 +266,14 @@ static void optimizeBlock(Block* curr,
// drop into the block, and remove br values. This allows more merging.
if (auto* drop = list[i]->dynCast<Drop>()) {
childBlock = drop->value->dynCast<Block>();
- if (childBlock) {
- if (hasUnreachableChild(childBlock)) {
- // don't move around unreachable code, as it can change types
- // dce should have been run anyhow
- continue;
- }
- if (optimizeDroppedBlock(
- drop, childBlock, *module, passOptions, branchInfo)) {
- child = list[i] = childBlock;
- more = true;
- changed = true;
- } else {
- childBlock = nullptr;
- }
+ if (childBlock &&
+ optimizeDroppedBlock(
+ drop, childBlock, *module, passOptions, branchInfo)) {
+ child = list[i] = childBlock;
+ more = true;
+ changed = true;
+ } else {
+ childBlock = nullptr;
}
} else if ((loop = list[i]->dynCast<Loop>())) {
// We can merge a loop's "tail" - if the body is a block and has
diff --git a/test/lit/passes/merge-blocks.wast b/test/lit/passes/merge-blocks.wast
index 86181f7a4..6fa1687b8 100644
--- a/test/lit/passes/merge-blocks.wast
+++ b/test/lit/passes/merge-blocks.wast
@@ -405,11 +405,12 @@
)
;; CHECK: (func $toplevel (type $4)
- ;; CHECK-NEXT: (block $label
- ;; CHECK-NEXT: (drop
- ;; CHECK-NEXT: (i32.const 42)
+ ;; CHECK-NEXT: (drop
+ ;; CHECK-NEXT: (block $label (result i32)
+ ;; CHECK-NEXT: (br $label
+ ;; CHECK-NEXT: (i32.const 42)
+ ;; CHECK-NEXT: )
;; CHECK-NEXT: )
- ;; CHECK-NEXT: (br $label)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $toplevel
diff --git a/test/lit/passes/monomorphize-drop.wast b/test/lit/passes/monomorphize-drop.wast
index 2c6834204..a9f0e1f06 100644
--- a/test/lit/passes/monomorphize-drop.wast
+++ b/test/lit/passes/monomorphize-drop.wast
@@ -672,7 +672,12 @@
;; CAREFUL: (func $return-normal_4 (type $1)
;; CAREFUL-NEXT: (drop
-;; CAREFUL-NEXT: (call $import)
+;; CAREFUL-NEXT: (block
+;; CAREFUL-NEXT: (drop
+;; CAREFUL-NEXT: (call $import)
+;; CAREFUL-NEXT: )
+;; CAREFUL-NEXT: (return)
+;; CAREFUL-NEXT: )
;; CAREFUL-NEXT: )
;; CAREFUL-NEXT: )
diff --git a/test/passes/Oz_fuzz-exec_all-features.txt b/test/passes/Oz_fuzz-exec_all-features.txt
index d1a80c318..b69b9728c 100644
--- a/test/passes/Oz_fuzz-exec_all-features.txt
+++ b/test/passes/Oz_fuzz-exec_all-features.txt
@@ -183,10 +183,14 @@
(nop)
)
(func $br-on_non_null-2 (type $void_func)
- (call $log
- (i32.const 1)
+ (drop
+ (block
+ (call $log
+ (i32.const 1)
+ )
+ (unreachable)
+ )
)
- (unreachable)
)
(func $cast-on-func (type $void_func)
(call $log
diff --git a/test/passes/merge-blocks.txt b/test/passes/merge-blocks.txt
index 96e621704..86d97af4b 100644
--- a/test/passes/merge-blocks.txt
+++ b/test/passes/merge-blocks.txt
@@ -10,12 +10,11 @@
)
)
(func $drop-block-br
- (block $x
- (drop
- (i32.const 1)
- )
- (br $x)
- (drop
+ (drop
+ (block $x (result i32)
+ (br $x
+ (i32.const 1)
+ )
(i32.const 0)
)
)
@@ -78,9 +77,15 @@
)
)
(func $drop-block-squared-iloop
- (block $label$0
- (loop $label$2
- (br $label$2)
+ (drop
+ (block $label$0 (result i32)
+ (drop
+ (block $label$1
+ (loop $label$2
+ (br $label$2)
+ )
+ )
+ )
)
)
)
@@ -104,7 +109,11 @@
(func $loop-block-drop-block-return
(loop $label$4
(block $label$5
- (return)
+ (drop
+ (block $label$6 (result i32)
+ (return)
+ )
+ )
)
)
)
diff --git a/test/passes/remove-unused-names_merge-blocks_all-features.txt b/test/passes/remove-unused-names_merge-blocks_all-features.txt
index 17ba2bd4d..c1c803af5 100644
--- a/test/passes/remove-unused-names_merge-blocks_all-features.txt
+++ b/test/passes/remove-unused-names_merge-blocks_all-features.txt
@@ -286,11 +286,15 @@
(i32.const 30)
)
(drop
- (i32.const 10)
- )
- (i32.add
- (unreachable)
- (i32.const 20)
+ (block
+ (drop
+ (i32.const 10)
+ )
+ (i32.add
+ (unreachable)
+ (i32.const 20)
+ )
+ )
)
(drop
(i32.const 20)
@@ -818,13 +822,17 @@
)
(func $drop-unreachable (type $2) (result i32)
(local $0 i32)
- (unreachable)
+ (drop
+ (block (result i32)
+ (unreachable)
+ )
+ )
(unreachable)
)
(func $concrete_finale_in_unreachable (type $5) (result f64)
- (block
- (unreachable)
- (drop
+ (drop
+ (block (result f64)
+ (unreachable)
(f64.const 6.322092475576799e-96)
)
)
@@ -832,16 +840,22 @@
)
(func $dont-move-unreachable (type $3)
(loop $label$0
- (br $label$0)
(drop
- (i32.const 1)
+ (block (result i32)
+ (br $label$0)
+ (i32.const 1)
+ )
)
)
)
(func $dont-move-unreachable-last (type $3)
(loop $label$0
- (call $dont-move-unreachable-last)
- (br $label$0)
+ (drop
+ (block (result i32)
+ (call $dont-move-unreachable-last)
+ (br $label$0)
+ )
+ )
)
)
(func $move-around-unreachable-in-middle (type $3)
@@ -862,10 +876,16 @@
)
(func $drop-unreachable-block-with-concrete-final (type $3)
(drop
- (return)
- )
- (drop
- (i32.const -452)
+ (block (result i32)
+ (drop
+ (block
+ (drop
+ (return)
+ )
+ )
+ )
+ (i32.const -452)
+ )
)
)
(func $merging-with-unreachable-in-middle (type $2) (result i32)
@@ -881,9 +901,13 @@
)
(func $remove-br-after-unreachable (type $3)
(block $label$9
- (block
- (return)
- (br $label$9)
+ (drop
+ (block
+ (block
+ (return)
+ (br $label$9)
+ )
+ )
)
)
)
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-06 00:50:53 +0000