summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/ir/eh-utils.cpp4
-rw-r--r--src/passes/Flatten.cpp36
-rw-r--r--test/lit/passes/flatten-eh.wast234
3 files changed, 274 insertions, 0 deletions
diff --git a/src/ir/eh-utils.cpp b/src/ir/eh-utils.cpp
index ed7ec1e0a..31ddfe306 100644
--- a/src/ir/eh-utils.cpp
+++ b/src/ir/eh-utils.cpp
@@ -108,6 +108,10 @@ bool isPopValid(Expression* catchBody) {
}
void handleBlockNestedPops(Function* func, Module& wasm) {
+ if (!wasm.features.hasExceptionHandling()) {
+ return;
+ }
+
Builder builder(wasm);
FindAll<Try> trys(func->body);
for (auto* try_ : trys.list) {
diff --git a/src/passes/Flatten.cpp b/src/passes/Flatten.cpp
index 298b6241e..be43e57f2 100644
--- a/src/passes/Flatten.cpp
+++ b/src/passes/Flatten.cpp
@@ -41,6 +41,7 @@
#include <ir/branch-utils.h>
#include <ir/effects.h>
+#include <ir/eh-utils.h>
#include <ir/flat.h>
#include <ir/properties.h>
#include <ir/type-updating.h>
@@ -192,6 +193,37 @@ struct Flatten
loop->finalize();
replaceCurrent(rep);
+ } else if (auto* tryy = curr->dynCast<Try>()) {
+ // remove a try value
+ Expression* rep = tryy;
+ auto* originalBody = tryy->body;
+ std::vector<Expression*> originalCatchBodies(tryy->catchBodies.begin(),
+ tryy->catchBodies.end());
+ auto type = tryy->type;
+ if (type.isConcrete()) {
+ Index temp = builder.addVar(getFunction(), type);
+ if (tryy->body->type.isConcrete()) {
+ tryy->body = builder.makeLocalSet(temp, tryy->body);
+ }
+ for (Index i = 0; i < tryy->catchBodies.size(); i++) {
+ if (tryy->catchBodies[i]->type.isConcrete()) {
+ tryy->catchBodies[i] =
+ builder.makeLocalSet(temp, tryy->catchBodies[i]);
+ }
+ }
+ // and we leave just a get of the value
+ rep = builder.makeLocalGet(temp, type);
+ // the whole try is now a prelude
+ ourPreludes.push_back(tryy);
+ }
+ tryy->body = getPreludesWithExpression(originalBody, tryy->body);
+ for (Index i = 0; i < tryy->catchBodies.size(); i++) {
+ tryy->catchBodies[i] = getPreludesWithExpression(
+ originalCatchBodies[i], tryy->catchBodies[i]);
+ }
+ tryy->finalize();
+ replaceCurrent(rep);
+
} else {
WASM_UNREACHABLE("unexpected expr type");
}
@@ -347,6 +379,10 @@ struct Flatten
<< type;
}
}
+
+ // Flatten can generate blocks within 'catch', making pops invalid. Fix them
+ // up.
+ EHUtils::handleBlockNestedPops(curr, *getModule());
}
private:
diff --git a/test/lit/passes/flatten-eh.wast b/test/lit/passes/flatten-eh.wast
new file mode 100644
index 000000000..1d3906511
--- /dev/null
+++ b/test/lit/passes/flatten-eh.wast
@@ -0,0 +1,234 @@
+;; NOTE: Assertions have been generated by update_lit_checks.py and should not be edited.
+;; RUN: wasm-opt %s -all --flatten -S -o - | filecheck %s
+
+(module
+ ;; CHECK: (tag $e-i32 (param i32))
+ (tag $e-i32 (param i32))
+ ;; CHECK: (tag $e-f32 (param f32))
+ (tag $e-f32 (param f32))
+
+ ;; CHECK: (func $try_catch
+ ;; CHECK-NEXT: (local $x i32)
+ ;; CHECK-NEXT: (local $1 i32)
+ ;; CHECK-NEXT: (local $2 f32)
+ ;; CHECK-NEXT: (try $try
+ ;; CHECK-NEXT: (do
+ ;; CHECK-NEXT: (throw $e-i32
+ ;; CHECK-NEXT: (i32.const 0)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: (unreachable)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: (catch $e-i32
+ ;; CHECK-NEXT: (local.set $1
+ ;; CHECK-NEXT: (pop i32)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: (drop
+ ;; CHECK-NEXT: (local.get $1)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: (catch $e-f32
+ ;; CHECK-NEXT: (local.set $2
+ ;; CHECK-NEXT: (pop f32)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: (drop
+ ;; CHECK-NEXT: (local.get $2)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: )
+ (func $try_catch (local $x i32)
+ ;; Basic try-catch test
+ (try
+ (do
+ (throw $e-i32 (i32.const 0))
+ )
+ (catch $e-i32
+ (drop
+ (pop i32)
+ )
+ )
+ (catch $e-f32
+ (drop
+ (pop f32)
+ )
+ )
+ )
+ )
+
+ ;; CHECK: (func $try_catch_pop_fixup
+ ;; CHECK-NEXT: (local $0 i32)
+ ;; CHECK-NEXT: (local $1 i32)
+ ;; CHECK-NEXT: (block $l0
+ ;; CHECK-NEXT: (try $try
+ ;; CHECK-NEXT: (do
+ ;; CHECK-NEXT: (nop)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: (catch $e-i32
+ ;; CHECK-NEXT: (local.set $1
+ ;; CHECK-NEXT: (pop i32)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: (block
+ ;; CHECK-NEXT: (block
+ ;; CHECK-NEXT: (local.set $0
+ ;; CHECK-NEXT: (local.get $1)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: (drop
+ ;; CHECK-NEXT: (local.get $0)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: (br $l0)
+ ;; CHECK-NEXT: (unreachable)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: (unreachable)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: )
+ (func $try_catch_pop_fixup
+ ;; After --flatten, a block is created within the 'catch', which makes the
+ ;; pop's location invalid. This tests whether it is fixed up correctly after
+ ;; --flatten.
+ (block $l0
+ (try
+ (do)
+ (catch $e-i32
+ (drop
+ (pop i32)
+ )
+ (br $l0)
+ )
+ )
+ )
+ )
+
+ ;; CHECK: (func $try_catch_return_value (result i32)
+ ;; CHECK-NEXT: (local $0 i32)
+ ;; CHECK-NEXT: (local $1 i32)
+ ;; CHECK-NEXT: (local $2 i32)
+ ;; CHECK-NEXT: (try $try
+ ;; CHECK-NEXT: (do
+ ;; CHECK-NEXT: (local.set $1
+ ;; CHECK-NEXT: (i32.const 0)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: (catch $e-i32
+ ;; CHECK-NEXT: (local.set $0
+ ;; CHECK-NEXT: (pop i32)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: (local.set $1
+ ;; CHECK-NEXT: (local.get $0)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: (local.set $2
+ ;; CHECK-NEXT: (local.get $1)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: (return
+ ;; CHECK-NEXT: (local.get $2)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: )
+ (func $try_catch_return_value (result i32)
+ (try (result i32)
+ (do
+ (i32.const 0)
+ )
+ (catch $e-i32
+ (pop i32)
+ )
+ )
+ )
+
+ ;; CHECK: (func $try_unreachable (result i32)
+ ;; CHECK-NEXT: (local $0 i32)
+ ;; CHECK-NEXT: (local $1 i32)
+ ;; CHECK-NEXT: (local $2 i32)
+ ;; CHECK-NEXT: (try $try
+ ;; CHECK-NEXT: (do
+ ;; CHECK-NEXT: (unreachable)
+ ;; CHECK-NEXT: (unreachable)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: (catch $e-i32
+ ;; CHECK-NEXT: (local.set $0
+ ;; CHECK-NEXT: (pop i32)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: (local.set $1
+ ;; CHECK-NEXT: (local.get $0)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: (local.set $2
+ ;; CHECK-NEXT: (local.get $1)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: (return
+ ;; CHECK-NEXT: (local.get $2)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: )
+ (func $try_unreachable (result i32)
+ (try (result i32)
+ (do
+ (unreachable)
+ )
+ (catch $e-i32
+ (pop i32)
+ )
+ )
+ )
+
+ ;; CHECK: (func $catch_unreachable (result i32)
+ ;; CHECK-NEXT: (local $0 i32)
+ ;; CHECK-NEXT: (local $1 i32)
+ ;; CHECK-NEXT: (local $2 i32)
+ ;; CHECK-NEXT: (local $3 i32)
+ ;; CHECK-NEXT: (local $4 i32)
+ ;; CHECK-NEXT: (local $5 i32)
+ ;; CHECK-NEXT: (try $try
+ ;; CHECK-NEXT: (do
+ ;; CHECK-NEXT: (local.set $3
+ ;; CHECK-NEXT: (i32.const 3)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: (catch $e-i32
+ ;; CHECK-NEXT: (local.set $5
+ ;; CHECK-NEXT: (pop i32)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: (block
+ ;; CHECK-NEXT: (block
+ ;; CHECK-NEXT: (local.set $0
+ ;; CHECK-NEXT: (local.get $5)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: (drop
+ ;; CHECK-NEXT: (local.get $0)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: (unreachable)
+ ;; CHECK-NEXT: (unreachable)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: (local.set $2
+ ;; CHECK-NEXT: (local.get $1)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: (local.set $3
+ ;; CHECK-NEXT: (local.get $2)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: (local.set $4
+ ;; CHECK-NEXT: (local.get $3)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: (return
+ ;; CHECK-NEXT: (local.get $4)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: )
+ (func $catch_unreachable (result i32)
+ (try (result i32)
+ (do
+ (i32.const 3)
+ )
+ (catch $e-i32
+ (drop
+ (pop i32)
+ )
+ (unreachable)
+ )
+ )
+ )
+)
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-05 21:02:41 +0000