diff options
| -rw-r--r-- | src/passes/CodePushing.cpp | 4 | ||||
| -rw-r--r-- | test/lit/passes/code-pushing-gc.wast | 80 |
2 files changed, 82 insertions, 2 deletions
diff --git a/src/passes/CodePushing.cpp b/src/passes/CodePushing.cpp index c71078558..1b253c6ea 100644 --- a/src/passes/CodePushing.cpp +++ b/src/passes/CodePushing.cpp @@ -134,14 +134,14 @@ private: return nullptr; } - // Push past conditional control flow. + // Try to push past conditional control flow. // TODO: push into ifs as well bool isPushPoint(Expression* curr) { // look through drops if (auto* drop = curr->dynCast<Drop>()) { curr = drop->value; } - if (curr->is<If>()) { + if (curr->is<If>() || curr->is<BrOn>()) { return true; } if (auto* br = curr->dynCast<Break>()) { diff --git a/test/lit/passes/code-pushing-gc.wast b/test/lit/passes/code-pushing-gc.wast new file mode 100644 index 000000000..9af0fc019 --- /dev/null +++ b/test/lit/passes/code-pushing-gc.wast @@ -0,0 +1,80 @@ +;; NOTE: Assertions have been generated by update_lit_checks.py and should not be edited. +;; RUN: wasm-opt %s --code-pushing -all -S -o - | filecheck %s + +(module + ;; CHECK: (func $br_on + ;; CHECK-NEXT: (local $x funcref) + ;; CHECK-NEXT: (drop + ;; CHECK-NEXT: (block $out (result (ref func)) + ;; CHECK-NEXT: (drop + ;; CHECK-NEXT: (br_on_func $out + ;; CHECK-NEXT: (ref.func $br_on) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (local.set $x + ;; CHECK-NEXT: (ref.func $br_on) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (drop + ;; CHECK-NEXT: (local.get $x) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (ref.func $br_on) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + (func $br_on + (local $x (ref null func)) + (drop + (block $out (result (ref func)) + ;; We can push the local.set past the br_on. + (local.set $x (ref.func $br_on)) + (drop + (br_on_func $out + (ref.func $br_on) + ) + ) + (drop + (local.get $x) + ) + (ref.func $br_on) + ) + ) + ) + + ;; CHECK: (func $br_on_no + ;; CHECK-NEXT: (local $x funcref) + ;; CHECK-NEXT: (drop + ;; CHECK-NEXT: (block $out (result (ref func)) + ;; CHECK-NEXT: (local.set $x + ;; CHECK-NEXT: (ref.func $br_on_no) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (drop + ;; CHECK-NEXT: (br_on_func $out + ;; CHECK-NEXT: (ref.func $br_on_no) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (ref.func $br_on_no) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: (drop + ;; CHECK-NEXT: (local.get $x) + ;; CHECK-NEXT: ) + ;; CHECK-NEXT: ) + (func $br_on_no + (local $x (ref null func)) + ;; We can't push here since the local.get is outside of the loop. + (drop + (block $out (result (ref func)) + (local.set $x (ref.func $br_on_no)) + (drop + (br_on_func $out + (ref.func $br_on_no) + ) + ) + (ref.func $br_on_no) + ) + ) + (drop + (local.get $x) + ) + ) +) |