summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/passes/MergeBlocks.cpp40
-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.txt206
6 files changed, 123 insertions, 178 deletions
diff --git a/src/passes/MergeBlocks.cpp b/src/passes/MergeBlocks.cpp
index 7518c73ca..147ba9f45 100644
--- a/src/passes/MergeBlocks.cpp
+++ b/src/passes/MergeBlocks.cpp
@@ -176,15 +176,6 @@ struct BreakValueDropper : public ControlFlowWalker<BreakValueDropper> {
}
};
-static bool hasUnreachableChild(Block* block) {
- for (auto* test : block->list) {
- if (test->type == Type::unreachable) {
- return true;
- }
- }
- return false;
-}
-
// Checks for code after an unreachable element.
static bool hasDeadCode(Block* block) {
auto& list = block->list;
@@ -206,11 +197,6 @@ 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;
@@ -241,8 +227,8 @@ static bool optimizeDroppedBlock(Drop* drop,
return true;
}
-// Core block optimizer routine.
-static void optimizeBlock(Block* curr,
+// Core block optimizer routine. Returns true when we optimize.
+static bool optimizeBlock(Block* curr,
Module* module,
PassOptions& passOptions,
BranchUtils::BranchSeekerCache& branchInfo) {
@@ -412,6 +398,7 @@ static void optimizeBlock(Block* curr,
if (changed) {
curr->finalize(curr->type);
}
+ return changed;
}
void BreakValueDropper::visitBlock(Block* curr) {
@@ -427,6 +414,8 @@ struct MergeBlocks
return std::make_unique<MergeBlocks>();
}
+ bool refinalize = false;
+
BranchUtils::BranchSeekerCache branchInfo;
void visitBlock(Block* curr) {
@@ -438,6 +427,7 @@ struct MergeBlocks
if (optimizeDroppedBlock(
curr, block, *getModule(), getPassOptions(), branchInfo)) {
replaceCurrent(block);
+ refinalize = true;
}
}
}
@@ -485,13 +475,6 @@ struct MergeBlocks
}
if (auto* block = child->dynCast<Block>()) {
if (!block->name.is() && block->list.size() >= 2) {
- // if we move around unreachable code, type changes could occur. avoid
- // that, as anyhow it means we should have run dce before getting here
- if (curr->type == Type::none && hasUnreachableChild(block)) {
- // moving the block to the outside would replace a none with an
- // unreachable
- return outer;
- }
auto* back = block->list.back();
if (back->type == Type::unreachable) {
// curr is not reachable, dce could remove it; don't try anything
@@ -510,6 +493,7 @@ struct MergeBlocks
return outer;
}
child = back;
+ refinalize = true;
if (outer == nullptr) {
// reuse the block, move it out
block->list.back() = curr;
@@ -600,8 +584,7 @@ struct MergeBlocks
// too small for us to remove anything from (we cannot remove the last
// element), or if it has unreachable code (leave that for dce), then give
// up.
- if (!block || block->name.is() || block->list.size() <= 1 ||
- hasUnreachableChild(block)) {
+ if (!block || block->name.is() || block->list.size() <= 1) {
continueEarly();
continue;
}
@@ -682,6 +665,7 @@ struct MergeBlocks
outerBlock->list.push_back(curr);
outerBlock->finalize(curr->type);
replaceCurrent(outerBlock);
+ refinalize = true;
}
}
@@ -700,6 +684,12 @@ struct MergeBlocks
outer = optimize(curr, curr->operands[i], outer);
}
}
+
+ void visitFunction(Function* curr) {
+ if (refinalize) {
+ ReFinalize().walkFunctionInModule(curr, getModule());
+ }
+ }
};
Pass* createMergeBlocksPass() { return new MergeBlocks(); }
diff --git a/test/lit/passes/merge-blocks.wast b/test/lit/passes/merge-blocks.wast
index 6fa1687b8..86181f7a4 100644
--- a/test/lit/passes/merge-blocks.wast
+++ b/test/lit/passes/merge-blocks.wast
@@ -405,12 +405,11 @@
)
;; CHECK: (func $toplevel (type $4)
- ;; CHECK-NEXT: (drop
- ;; CHECK-NEXT: (block $label (result i32)
- ;; CHECK-NEXT: (br $label
- ;; CHECK-NEXT: (i32.const 42)
- ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: (block $label
+ ;; CHECK-NEXT: (drop
+ ;; CHECK-NEXT: (i32.const 42)
;; 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 a9f0e1f06..2c6834204 100644
--- a/test/lit/passes/monomorphize-drop.wast
+++ b/test/lit/passes/monomorphize-drop.wast
@@ -672,12 +672,7 @@
;; CAREFUL: (func $return-normal_4 (type $1)
;; CAREFUL-NEXT: (drop
-;; CAREFUL-NEXT: (block
-;; CAREFUL-NEXT: (drop
-;; CAREFUL-NEXT: (call $import)
-;; CAREFUL-NEXT: )
-;; CAREFUL-NEXT: (return)
-;; CAREFUL-NEXT: )
+;; CAREFUL-NEXT: (call $import)
;; 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 b69b9728c..d1a80c318 100644
--- a/test/passes/Oz_fuzz-exec_all-features.txt
+++ b/test/passes/Oz_fuzz-exec_all-features.txt
@@ -183,14 +183,10 @@
(nop)
)
(func $br-on_non_null-2 (type $void_func)
- (drop
- (block
- (call $log
- (i32.const 1)
- )
- (unreachable)
- )
+ (call $log
+ (i32.const 1)
)
+ (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 86d97af4b..96e621704 100644
--- a/test/passes/merge-blocks.txt
+++ b/test/passes/merge-blocks.txt
@@ -10,11 +10,12 @@
)
)
(func $drop-block-br
- (drop
- (block $x (result i32)
- (br $x
- (i32.const 1)
- )
+ (block $x
+ (drop
+ (i32.const 1)
+ )
+ (br $x)
+ (drop
(i32.const 0)
)
)
@@ -77,15 +78,9 @@
)
)
(func $drop-block-squared-iloop
- (drop
- (block $label$0 (result i32)
- (drop
- (block $label$1
- (loop $label$2
- (br $label$2)
- )
- )
- )
+ (block $label$0
+ (loop $label$2
+ (br $label$2)
)
)
)
@@ -109,11 +104,7 @@
(func $loop-block-drop-block-return
(loop $label$4
(block $label$5
- (drop
- (block $label$6 (result i32)
- (return)
- )
- )
+ (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 c1c803af5..ec63edd5e 100644
--- a/test/passes/remove-unused-names_merge-blocks_all-features.txt
+++ b/test/passes/remove-unused-names_merge-blocks_all-features.txt
@@ -286,26 +286,22 @@
(i32.const 30)
)
(drop
- (block
- (drop
- (i32.const 10)
- )
- (i32.add
- (unreachable)
- (i32.const 20)
- )
- )
+ (i32.const 10)
)
- (drop
+ (i32.add
+ (unreachable)
(i32.const 20)
)
- (drop
- (i32.add
- (block (result i32)
- (unreachable)
+ (block
+ (unreachable)
+ (drop
+ (i32.const 20)
+ )
+ (drop
+ (i32.add
(i32.const 10)
+ (i32.const 30)
)
- (i32.const 30)
)
)
)
@@ -413,20 +409,20 @@
)
)
)
- (drop
- (i32.const 30)
- )
- (drop
- (i32.const 50)
- )
- (drop
- (select
- (block (result i32)
- (unreachable)
+ (block
+ (unreachable)
+ (drop
+ (i32.const 30)
+ )
+ (drop
+ (i32.const 50)
+ )
+ (drop
+ (select
(i32.const 20)
+ (i32.const 40)
+ (i32.const 60)
)
- (i32.const 40)
- (i32.const 60)
)
)
(drop
@@ -437,7 +433,7 @@
)
(drop
(select
- (block (result i32)
+ (block
(drop
(i32.const 10)
)
@@ -447,20 +443,20 @@
(i32.const 60)
)
)
- (drop
- (i32.const 10)
- )
- (drop
- (i32.const 50)
- )
- (drop
- (select
- (i32.const 20)
- (block (result i32)
- (unreachable)
+ (block
+ (drop
+ (i32.const 10)
+ )
+ (unreachable)
+ (drop
+ (i32.const 50)
+ )
+ (drop
+ (select
+ (i32.const 20)
(i32.const 40)
+ (i32.const 60)
)
- (i32.const 60)
)
)
(drop
@@ -472,7 +468,7 @@
(drop
(select
(i32.const 20)
- (block (result i32)
+ (block
(drop
(i32.const 30)
)
@@ -481,18 +477,18 @@
(i32.const 60)
)
)
- (drop
- (i32.const 10)
- )
- (drop
- (i32.const 30)
- )
- (drop
- (select
- (i32.const 20)
- (i32.const 40)
- (block (result i32)
- (unreachable)
+ (block
+ (drop
+ (i32.const 10)
+ )
+ (drop
+ (i32.const 30)
+ )
+ (unreachable)
+ (drop
+ (select
+ (i32.const 20)
+ (i32.const 40)
(i32.const 60)
)
)
@@ -507,7 +503,7 @@
(select
(i32.const 20)
(i32.const 40)
- (block (result i32)
+ (block
(drop
(i32.const 50)
)
@@ -597,21 +593,21 @@
(i32.const 20)
(i32.const 40)
)
- (drop
- (i32.const 20)
- )
- (call $call-ii
- (block (result i32)
- (unreachable)
+ (block
+ (unreachable)
+ (drop
+ (i32.const 20)
+ )
+ (call $call-ii
(i32.const 10)
+ (i32.const 30)
)
- (i32.const 30)
)
(drop
(i32.const 20)
)
(call $call-ii
- (block (result i32)
+ (block
(drop
(i32.const 10)
)
@@ -619,13 +615,13 @@
)
(i32.const 30)
)
- (drop
- (i32.const 10)
- )
- (call $call-ii
- (i32.const 20)
- (block (result i32)
- (unreachable)
+ (block
+ (drop
+ (i32.const 10)
+ )
+ (unreachable)
+ (call $call-ii
+ (i32.const 20)
(i32.const 30)
)
)
@@ -634,7 +630,7 @@
)
(call $call-ii
(i32.const 20)
- (block (result i32)
+ (block
(drop
(i32.const 30)
)
@@ -807,32 +803,24 @@
)
(func $return-different-type (type $2) (result i32)
(drop
- (f64.abs
- (block
- (drop
- (i32.const 2)
- )
- (return
- (i32.const 1)
- )
- )
+ (i32.const 2)
+ )
+ (f64.abs
+ (return
+ (i32.const 1)
)
)
(unreachable)
)
(func $drop-unreachable (type $2) (result i32)
(local $0 i32)
- (drop
- (block (result i32)
- (unreachable)
- )
- )
+ (unreachable)
(unreachable)
)
(func $concrete_finale_in_unreachable (type $5) (result f64)
- (drop
- (block (result f64)
- (unreachable)
+ (block
+ (unreachable)
+ (drop
(f64.const 6.322092475576799e-96)
)
)
@@ -840,22 +828,16 @@
)
(func $dont-move-unreachable (type $3)
(loop $label$0
+ (br $label$0)
(drop
- (block (result i32)
- (br $label$0)
- (i32.const 1)
- )
+ (i32.const 1)
)
)
)
(func $dont-move-unreachable-last (type $3)
(loop $label$0
- (drop
- (block (result i32)
- (call $dont-move-unreachable-last)
- (br $label$0)
- )
- )
+ (call $dont-move-unreachable-last)
+ (br $label$0)
)
)
(func $move-around-unreachable-in-middle (type $3)
@@ -864,9 +846,11 @@
(drop
(block $label$3 (result i32)
(drop
- (br_if $label$3
+ (block
(br $label$0)
- (i32.const 0)
+ (drop
+ (i32.const 0)
+ )
)
)
(i32.const 1)
@@ -876,16 +860,10 @@
)
(func $drop-unreachable-block-with-concrete-final (type $3)
(drop
- (block (result i32)
- (drop
- (block
- (drop
- (return)
- )
- )
- )
- (i32.const -452)
- )
+ (return)
+ )
+ (drop
+ (i32.const -452)
)
)
(func $merging-with-unreachable-in-middle (type $2) (result i32)
@@ -901,13 +879,9 @@
)
(func $remove-br-after-unreachable (type $3)
(block $label$9
- (drop
- (block
- (block
- (return)
- (br $label$9)
- )
- )
+ (block
+ (return)
+ (br $label$9)
)
)
)
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-06 23:40:01 +0000