summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/passes/CodePushing.cpp5
-rw-r--r--test/lit/passes/code-pushing_into_if.wast105
2 files changed, 76 insertions, 34 deletions
diff --git a/src/passes/CodePushing.cpp b/src/passes/CodePushing.cpp
index 2b45dda16..65eedba6b 100644
--- a/src/passes/CodePushing.cpp
+++ b/src/passes/CodePushing.cpp
@@ -455,11 +455,6 @@ private:
struct CodePushing : public WalkerPass<PostWalker<CodePushing>> {
bool isFunctionParallel() override { return true; }
- // This pass moves code forward in blocks, but a local.set would not be moved
- // after a local.get with the same index (effects prevent breaking things that
- // way), so validation will be preserved.
- bool requiresNonNullableLocalFixups() override { return false; }
-
std::unique_ptr<Pass> create() override {
return std::make_unique<CodePushing>();
}
diff --git a/test/lit/passes/code-pushing_into_if.wast b/test/lit/passes/code-pushing_into_if.wast
index 06e64dab6..504d4776d 100644
--- a/test/lit/passes/code-pushing_into_if.wast
+++ b/test/lit/passes/code-pushing_into_if.wast
@@ -1,11 +1,11 @@
;; NOTE: Assertions have been generated by update_lit_checks.py and should not be edited.
-;; RUN: wasm-opt %s --code-pushing --enable-reference-types -S -o - | filecheck %s
+;; RUN: wasm-opt %s --code-pushing -all -S -o - | filecheck %s
(module
;; CHECK: (import "binaryen-intrinsics" "call.without.effects" (func $call.without.effects (param i32 funcref) (result i32)))
(import "binaryen-intrinsics" "call.without.effects" (func $call.without.effects (param i32 funcref) (result i32)))
- ;; CHECK: (func $if-nop (param $p i32)
+ ;; CHECK: (func $if-nop (type $i32_=>_none) (param $p i32)
;; CHECK-NEXT: (local $x i32)
;; CHECK-NEXT: (local.set $x
;; CHECK-NEXT: (i32.const 1)
@@ -25,7 +25,7 @@
)
)
- ;; CHECK: (func $if-nop-nop (param $p i32)
+ ;; CHECK: (func $if-nop-nop (type $i32_=>_none) (param $p i32)
;; CHECK-NEXT: (local $x i32)
;; CHECK-NEXT: (local.set $x
;; CHECK-NEXT: (i32.const 1)
@@ -46,7 +46,7 @@
)
)
- ;; CHECK: (func $if-use (param $p i32)
+ ;; CHECK: (func $if-use (type $i32_=>_none) (param $p i32)
;; CHECK-NEXT: (local $x i32)
;; CHECK-NEXT: (nop)
;; CHECK-NEXT: (if
@@ -71,7 +71,7 @@
)
)
- ;; CHECK: (func $if-use-nop (param $p i32)
+ ;; CHECK: (func $if-use-nop (type $i32_=>_none) (param $p i32)
;; CHECK-NEXT: (local $x i32)
;; CHECK-NEXT: (nop)
;; CHECK-NEXT: (if
@@ -97,7 +97,7 @@
)
)
- ;; CHECK: (func $if-else-use (param $p i32)
+ ;; CHECK: (func $if-else-use (type $i32_=>_none) (param $p i32)
;; CHECK-NEXT: (local $x i32)
;; CHECK-NEXT: (nop)
;; CHECK-NEXT: (if
@@ -124,7 +124,7 @@
)
)
- ;; CHECK: (func $unpushed-interference (param $p i32)
+ ;; CHECK: (func $unpushed-interference (type $i32_=>_none) (param $p i32)
;; CHECK-NEXT: (local $x i32)
;; CHECK-NEXT: (local $y i32)
;; CHECK-NEXT: (local.set $x
@@ -154,7 +154,7 @@
)
)
- ;; CHECK: (func $if-use-use (param $p i32)
+ ;; CHECK: (func $if-use-use (type $i32_=>_none) (param $p i32)
;; CHECK-NEXT: (local $x i32)
;; CHECK-NEXT: (local.set $x
;; CHECK-NEXT: (i32.const 1)
@@ -180,7 +180,7 @@
)
)
- ;; CHECK: (func $if-use-after (param $p i32)
+ ;; CHECK: (func $if-use-after (type $i32_=>_none) (param $p i32)
;; CHECK-NEXT: (local $x i32)
;; CHECK-NEXT: (local.set $x
;; CHECK-NEXT: (i32.const 1)
@@ -206,7 +206,7 @@
(drop (local.get $x))
)
- ;; CHECK: (func $if-use-after-nop (param $p i32)
+ ;; CHECK: (func $if-use-after-nop (type $i32_=>_none) (param $p i32)
;; CHECK-NEXT: (local $x i32)
;; CHECK-NEXT: (local.set $x
;; CHECK-NEXT: (i32.const 1)
@@ -233,7 +233,7 @@
(drop (local.get $x))
)
- ;; CHECK: (func $if-else-use-after (param $p i32)
+ ;; CHECK: (func $if-else-use-after (type $i32_=>_none) (param $p i32)
;; CHECK-NEXT: (local $x i32)
;; CHECK-NEXT: (local.set $x
;; CHECK-NEXT: (i32.const 1)
@@ -260,7 +260,7 @@
(drop (local.get $x))
)
- ;; CHECK: (func $if-use-after-unreachable (param $p i32)
+ ;; CHECK: (func $if-use-after-unreachable (type $i32_=>_none) (param $p i32)
;; CHECK-NEXT: (local $x i32)
;; CHECK-NEXT: (nop)
;; CHECK-NEXT: (if
@@ -291,7 +291,7 @@
(drop (local.get $x))
)
- ;; CHECK: (func $if-use-after-unreachable-else (param $p i32)
+ ;; CHECK: (func $if-use-after-unreachable-else (type $i32_=>_none) (param $p i32)
;; CHECK-NEXT: (local $x i32)
;; CHECK-NEXT: (nop)
;; CHECK-NEXT: (if
@@ -321,7 +321,7 @@
(drop (local.get $x))
)
- ;; CHECK: (func $optimize-many (param $p i32)
+ ;; CHECK: (func $optimize-many (type $i32_=>_none) (param $p i32)
;; CHECK-NEXT: (local $x i32)
;; CHECK-NEXT: (local $y i32)
;; CHECK-NEXT: (local $z i32)
@@ -372,7 +372,7 @@
)
)
- ;; CHECK: (func $past-other (param $p i32)
+ ;; CHECK: (func $past-other (type $i32_=>_none) (param $p i32)
;; CHECK-NEXT: (local $x i32)
;; CHECK-NEXT: (local $t i32)
;; CHECK-NEXT: (nop)
@@ -403,7 +403,7 @@
)
)
- ;; CHECK: (func $past-other-no (param $p i32)
+ ;; CHECK: (func $past-other-no (type $i32_=>_none) (param $p i32)
;; CHECK-NEXT: (local $x i32)
;; CHECK-NEXT: (local $t i32)
;; CHECK-NEXT: (local.set $x
@@ -433,7 +433,7 @@
)
)
- ;; CHECK: (func $past-condition-no (param $p i32)
+ ;; CHECK: (func $past-condition-no (type $i32_=>_none) (param $p i32)
;; CHECK-NEXT: (local $x i32)
;; CHECK-NEXT: (local $t i32)
;; CHECK-NEXT: (local.set $x
@@ -459,7 +459,7 @@
)
)
- ;; CHECK: (func $past-condition-no-2
+ ;; CHECK: (func $past-condition-no-2 (type $none_=>_none)
;; CHECK-NEXT: (local $x i32)
;; CHECK-NEXT: (local $t i32)
;; CHECK-NEXT: (local.set $x
@@ -483,7 +483,7 @@
)
)
- ;; CHECK: (func $past-condition-no-3 (param $p i32)
+ ;; CHECK: (func $past-condition-no-3 (type $i32_=>_none) (param $p i32)
;; CHECK-NEXT: (local $x i32)
;; CHECK-NEXT: (local $t i32)
;; CHECK-NEXT: (local.set $x
@@ -509,7 +509,7 @@
)
)
- ;; CHECK: (func $if-condition-return (param $p i32)
+ ;; CHECK: (func $if-condition-return (type $i32_=>_none) (param $p i32)
;; CHECK-NEXT: (local $x i32)
;; CHECK-NEXT: (nop)
;; CHECK-NEXT: (if
@@ -541,7 +541,7 @@
)
)
- ;; CHECK: (func $if-condition-break-used (param $p i32)
+ ;; CHECK: (func $if-condition-break-used (type $i32_=>_none) (param $p i32)
;; CHECK-NEXT: (local $x i32)
;; CHECK-NEXT: (local.set $x
;; CHECK-NEXT: (i32.const 1)
@@ -580,7 +580,7 @@
(drop (local.get $x))
)
- ;; CHECK: (func $one-push-prevents-another (param $p i32)
+ ;; CHECK: (func $one-push-prevents-another (type $i32_=>_none) (param $p i32)
;; CHECK-NEXT: (local $x i32)
;; CHECK-NEXT: (local $y i32)
;; CHECK-NEXT: (local.set $x
@@ -616,7 +616,7 @@
)
)
- ;; CHECK: (func $one-push-prevents-another-flipped (param $p i32)
+ ;; CHECK: (func $one-push-prevents-another-flipped (type $i32_=>_none) (param $p i32)
;; CHECK-NEXT: (local $x i32)
;; CHECK-NEXT: (local $y i32)
;; CHECK-NEXT: (local.set $x
@@ -652,7 +652,7 @@
)
)
- ;; CHECK: (func $sink-call (param $p i32) (result i32)
+ ;; CHECK: (func $sink-call (type $i32_=>_i32) (param $p i32) (result i32)
;; CHECK-NEXT: (local $temp i32)
;; CHECK-NEXT: (nop)
;; CHECK-NEXT: (if
@@ -691,7 +691,7 @@
(i32.const 0)
)
- ;; CHECK: (func $no-sink-call (param $p i32) (result i32)
+ ;; CHECK: (func $no-sink-call (type $i32_=>_i32) (param $p i32) (result i32)
;; CHECK-NEXT: (local $temp i32)
;; CHECK-NEXT: (local.set $temp
;; CHECK-NEXT: (call $call.without.effects
@@ -728,7 +728,7 @@
(local.get $temp) ;; this line changed.
)
- ;; CHECK: (func $no-sink-call-2 (param $p i32) (result i32)
+ ;; CHECK: (func $no-sink-call-2 (type $i32_=>_i32) (param $p i32) (result i32)
;; CHECK-NEXT: (local $temp i32)
;; CHECK-NEXT: (local.set $temp
;; CHECK-NEXT: (call $call.without.effects
@@ -766,7 +766,7 @@
(local.get $temp)
)
- ;; CHECK: (func $no-sink-call-3 (param $p i32) (result i32)
+ ;; CHECK: (func $no-sink-call-3 (type $i32_=>_i32) (param $p i32) (result i32)
;; CHECK-NEXT: (local $temp i32)
;; CHECK-NEXT: (local.set $temp
;; CHECK-NEXT: (call $call.without.effects
@@ -812,7 +812,7 @@
(i32.const 0) ;; this line was added.
)
- ;; CHECK: (func $sink-call-3 (param $p i32) (result i32)
+ ;; CHECK: (func $sink-call-3 (type $i32_=>_i32) (param $p i32) (result i32)
;; CHECK-NEXT: (local $temp i32)
;; CHECK-NEXT: (nop)
;; CHECK-NEXT: (if
@@ -862,7 +862,7 @@
(i32.const 0)
)
- ;; CHECK: (func $no-sink-call-sub (param $p i32) (result i32)
+ ;; CHECK: (func $no-sink-call-sub (type $i32_=>_i32) (param $p i32) (result i32)
;; CHECK-NEXT: (local $temp i32)
;; CHECK-NEXT: (local $other i32)
;; CHECK-NEXT: (local.set $temp
@@ -903,4 +903,51 @@
)
(i32.const 0)
)
+
+ ;; CHECK: (func $ref-into-if (type $ref|any|_=>_none) (param $0 (ref any))
+ ;; CHECK-NEXT: (local $1 anyref)
+ ;; CHECK-NEXT: (nop)
+ ;; CHECK-NEXT: (if
+ ;; CHECK-NEXT: (i32.const 1)
+ ;; CHECK-NEXT: (unreachable)
+ ;; CHECK-NEXT: (block $label$3
+ ;; CHECK-NEXT: (local.set $1
+ ;; CHECK-NEXT: (local.get $0)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: (drop
+ ;; CHECK-NEXT: (ref.as_non_null
+ ;; CHECK-NEXT: (local.get $1)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: (drop
+ ;; CHECK-NEXT: (ref.as_non_null
+ ;; CHECK-NEXT: (local.get $1)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: )
+ (func $ref-into-if (param $0 (ref any))
+ (local $1 (ref any))
+ ;; This can be pushed into the reachable if arm. After doing so, however,
+ ;; the local $1 no longer has a single set that dominates it in the sense of
+ ;; the wasm validation rules for non-nullable locals, so the local must be
+ ;; turned into a nullable one.
+ (local.set $1
+ (local.get $0)
+ )
+ (if
+ (i32.const 1)
+ (unreachable)
+ (block $label$3
+ (drop
+ (local.get $1)
+ )
+ )
+ )
+ (drop
+ (local.get $1)
+ )
+ )
+
)
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-08 17:12:53 +0000