[StackIR] Run StackIR during binary writing and not as a pass (#6568)

Previously we had passes --generate-stack-ir, --optimize-stack-ir, --print-stack-ir
that could be run like any other passes. After generating StackIR it was stashed on
the function and invalidated if we modified BinaryenIR. If it wasn't invalidated then
it was used during binary writing. This PR switches things so that we optionally
generate, optimize, and print StackIR only during binary writing. It also removes
all traces of StackIR from wasm.h - after this, StackIR is a feature of binary writing
(and printing) logic only.

This is almost NFC, but there are some minor noticeable differences:

1.  We no longer print has StackIR in the text format when we see it is there. It
    will not be there during normal printing, as it is only present during binary writing.
    (but --print-stack-ir still works as before; as mentioned above it runs during writing).
2.  --generate/optimize/print-stack-ir change from being passes to being flags that
    control that behavior instead. As passes, their order on the commandline mattered,
    while now it does not, and they only "globally" affect things during writing.
3.  The C API changes slightly, as there is no need to pass it an option "optimize" to
    the StackIR APIs. Whether we optimize is handled by --optimize-stack-ir which is
    set like other optimization flags on the PassOptions object, so we don't need the
    old option to those C APIs.

The main benefit here is simplifying the code, so we don't need to think about
StackIR in more places than just binary writing. That may also allow future
improvements to our usage of StackIR.

14 files changed, 72 insertions, 72 deletions

diff --git a/test/lit/passes/O.wast b/test/lit/passes/O.wast
index 7affbb8b7..baba79ee0 100644
--- a/test/lit/passes/O.wast
+++ b/test/lit/passes/O.wast
@@ -20,7 +20,7 @@
 
   ;; CHECK:      (export "end-if-else-call" (func $end-if-else-call))
 
-  ;; CHECK:      (func $ret (; has Stack IR ;) (result i32)
+  ;; CHECK:      (func $ret (result i32)
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (call $ret)
   ;; CHECK-NEXT:  )
@@ -50,7 +50,7 @@
       (unreachable)
     )
   )
-  ;; CHECK:      (func $if-0-unreachable-to-none (; has Stack IR ;) (param $0 i64)
+  ;; CHECK:      (func $if-0-unreachable-to-none (param $0 i64)
   ;; CHECK-NEXT:  (unreachable)
   ;; CHECK-NEXT: )
   (func $if-0-unreachable-to-none (export "waka") (param $var$0 i64)
@@ -68,7 +68,7 @@
     )
    )
   )
-  ;; CHECK:      (func $many-selects (; has Stack IR ;) (param $0 i32) (result i32)
+  ;; CHECK:      (func $many-selects (param $0 i32) (result i32)
   ;; CHECK-NEXT:  (select
   ;; CHECK-NEXT:   (i32.const -1073741824)
   ;; CHECK-NEXT:   (select
@@ -112,7 +112,7 @@
    )
    (local.get $0)
   )
-  ;; CHECK:      (func $end-if-else (; has Stack IR ;) (param $0 i32) (result i32)
+  ;; CHECK:      (func $end-if-else (param $0 i32) (result i32)
   ;; CHECK-NEXT:  (select
   ;; CHECK-NEXT:   (i32.const 1)
   ;; CHECK-NEXT:   (local.get $0)
@@ -130,7 +130,7 @@
     )
     (local.get $x)
   )
-  ;; CHECK:      (func $end-if-else-call (; has Stack IR ;) (param $0 i32) (result i32)
+  ;; CHECK:      (func $end-if-else-call (param $0 i32) (result i32)
   ;; CHECK-NEXT:  (if (result i32)
   ;; CHECK-NEXT:   (local.get $0)
   ;; CHECK-NEXT:   (then
diff --git a/test/lit/passes/O1_skip.wast b/test/lit/passes/O1_skip.wast
index 2cefecdcf..54d6a6843 100644
--- a/test/lit/passes/O1_skip.wast
+++ b/test/lit/passes/O1_skip.wast
@@ -46,7 +46,7 @@
 )
 ;; CHECK:      (export "foo" (func $foo))
 
-;; CHECK:      (func $foo (; has Stack IR ;) (param $p i32)
+;; CHECK:      (func $foo (param $p i32)
 ;; CHECK-NEXT:  (local $x i32)
 ;; CHECK-NEXT:  (local $y i32)
 ;; CHECK-NEXT:  (call $log
diff --git a/test/lit/passes/O3_Oz.wast b/test/lit/passes/O3_Oz.wast
index 48345663e..cc129c964 100644
--- a/test/lit/passes/O3_Oz.wast
+++ b/test/lit/passes/O3_Oz.wast
@@ -14,7 +14,7 @@
 
   ;; CHECK:      (export "export" (func $export))
 
-  ;; CHECK:      (func $export (; has Stack IR ;) (param $0 i32) (result i32)
+  ;; CHECK:      (func $export (param $0 i32) (result i32)
   ;; CHECK-NEXT:  (i32.add
   ;; CHECK-NEXT:   (local.tee $0
   ;; CHECK-NEXT:    (i32.add
diff --git a/test/lit/passes/O3_inline-functions-with-loops_flexible-inline-max-function-size=30.wast b/test/lit/passes/O3_inline-functions-with-loops_flexible-inline-max-function-size=30.wast
index 7037baf7d..830008e2f 100644
--- a/test/lit/passes/O3_inline-functions-with-loops_flexible-inline-max-function-size=30.wast
+++ b/test/lit/passes/O3_inline-functions-with-loops_flexible-inline-max-function-size=30.wast
@@ -22,7 +22,7 @@
 
   ;; CHECK:      (export "memory" (memory $memory))
 
-  ;; CHECK:      (func $fib (; has Stack IR ;) (param $0 i32) (result i32)
+  ;; CHECK:      (func $fib (param $0 i32) (result i32)
   ;; CHECK-NEXT:  (if
   ;; CHECK-NEXT:   (i32.le_s
   ;; CHECK-NEXT:    (local.get $0)
@@ -76,7 +76,7 @@
       )
     )
   )
-  ;; CHECK:      (func $looped (; has Stack IR ;) (param $0 i32) (result i32)
+  ;; CHECK:      (func $looped (param $0 i32) (result i32)
   ;; CHECK-NEXT:  (loop $L0
   ;; CHECK-NEXT:   (if
   ;; CHECK-NEXT:    (i32.ge_s
@@ -123,7 +123,7 @@
     )
   )
 
-  ;; CHECK:      (func $t1 (; has Stack IR ;) (param $0 i32) (result i32)
+  ;; CHECK:      (func $t1 (param $0 i32) (result i32)
   ;; CHECK-NEXT:  (local.set $0
   ;; CHECK-NEXT:   (i32.add
   ;; CHECK-NEXT:    (local.get $0)
@@ -157,7 +157,7 @@
       )
     )
   )
-  ;; CHECK:      (func $t2 (; has Stack IR ;) (param $0 i32) (result i32)
+  ;; CHECK:      (func $t2 (param $0 i32) (result i32)
   ;; CHECK-NEXT:  (call $fib
   ;; CHECK-NEXT:   (local.get $0)
   ;; CHECK-NEXT:  )
@@ -168,7 +168,7 @@
     )
   )
 
-  ;; CHECK:      (func $t3 (; has Stack IR ;) (param $0 i32) (result i32)
+  ;; CHECK:      (func $t3 (param $0 i32) (result i32)
   ;; CHECK-NEXT:  (call $fib
   ;; CHECK-NEXT:   (i32.add
   ;; CHECK-NEXT:    (local.get $0)
diff --git a/test/lit/passes/O4_disable-bulk-memory.wast b/test/lit/passes/O4_disable-bulk-memory.wast
index 0cafb1d5d..d75258a96 100644
--- a/test/lit/passes/O4_disable-bulk-memory.wast
+++ b/test/lit/passes/O4_disable-bulk-memory.wast
@@ -9,7 +9,7 @@
  (global $global$0 (mut i32) (i32.const 10))
  ;; CHECK:      (export "func_59_invoker" (func $0))
  (export "func_59_invoker" (func $0))
- ;; CHECK:      (func $0 (; has Stack IR ;)
+ ;; CHECK:      (func $0
  ;; CHECK-NEXT:  (unreachable)
  ;; CHECK-NEXT: )
  (func $0 (; 0 ;) (type $0)
@@ -226,7 +226,7 @@
   )
   (local.get $0)
  )
- ;; CHECK:      (func $~lib/allocator/arena/__memory_allocate (; has Stack IR ;) (param $0 i32) (result i32)
+ ;; CHECK:      (func $~lib/allocator/arena/__memory_allocate (param $0 i32) (result i32)
  ;; CHECK-NEXT:  (local $1 i32)
  ;; CHECK-NEXT:  (local $2 i32)
  ;; CHECK-NEXT:  (local $3 i32)
@@ -569,7 +569,7 @@
   )
   (local.get $0)
  )
- ;; CHECK:      (func $assembly/index/Body#constructor (; has Stack IR ;) (param $0 f64) (param $1 f64) (param $2 f64) (param $3 f64) (param $4 f64) (param $5 f64) (param $6 f64) (result i32)
+ ;; CHECK:      (func $assembly/index/Body#constructor (param $0 f64) (param $1 f64) (param $2 f64) (param $3 f64) (param $4 f64) (param $5 f64) (param $6 f64) (result i32)
  ;; CHECK-NEXT:  (local $7 i32)
  ;; CHECK-NEXT:  (f64.store
  ;; CHECK-NEXT:   (local.tee $7
@@ -1299,7 +1299,7 @@
    (local.get $5)
   )
  )
- ;; CHECK:      (func $assembly/index/init (; has Stack IR ;)
+ ;; CHECK:      (func $assembly/index/init
  ;; CHECK-NEXT:  (local $0 i32)
  ;; CHECK-NEXT:  (local $1 i32)
  ;; CHECK-NEXT:  (local $2 i32)
@@ -1873,7 +1873,7 @@
    )
   )
  )
- ;; CHECK:      (func $assembly/index/NBodySystem#advance (; has Stack IR ;) (param $0 i32)
+ ;; CHECK:      (func $assembly/index/NBodySystem#advance (param $0 i32)
  ;; CHECK-NEXT:  (local $1 i32)
  ;; CHECK-NEXT:  (local $2 f64)
  ;; CHECK-NEXT:  (local $3 i32)
@@ -2723,7 +2723,7 @@
   )
   (local.get $7)
  )
- ;; CHECK:      (func $assembly/index/step (; has Stack IR ;) (result f64)
+ ;; CHECK:      (func $assembly/index/step (result f64)
  ;; CHECK-NEXT:  (local $0 f64)
  ;; CHECK-NEXT:  (local $1 i32)
  ;; CHECK-NEXT:  (local $2 i32)
@@ -2933,7 +2933,7 @@
    (global.get $global$5)
   )
  )
- ;; CHECK:      (func $assembly/index/bench (; has Stack IR ;) (param $0 i32)
+ ;; CHECK:      (func $assembly/index/bench (param $0 i32)
  ;; CHECK-NEXT:  (local $1 i32)
  ;; CHECK-NEXT:  (block $label$1
  ;; CHECK-NEXT:   (loop $label$2
@@ -2985,7 +2985,7 @@
    )
   )
  )
- ;; CHECK:      (func $assembly/index/getBody (; has Stack IR ;) (param $0 i32) (result i32)
+ ;; CHECK:      (func $assembly/index/getBody (param $0 i32) (result i32)
  ;; CHECK-NEXT:  (local $1 i32)
  ;; CHECK-NEXT:  (if (result i32)
  ;; CHECK-NEXT:   (i32.lt_u
@@ -3065,7 +3065,7 @@
    )
   )
  )
- ;; CHECK:      (func $start (; has Stack IR ;)
+ ;; CHECK:      (func $start
  ;; CHECK-NEXT:  (global.set $global$0
  ;; CHECK-NEXT:   (i32.const 104)
  ;; CHECK-NEXT:  )
@@ -3076,7 +3076,7 @@
  (func $start (; 26 ;) (type $0)
   (call $start:assembly/index)
  )
- ;; CHECK:      (func $null (; has Stack IR ;)
+ ;; CHECK:      (func $null
  ;; CHECK-NEXT:  (nop)
  ;; CHECK-NEXT: )
  (func $null (; 27 ;) (type $0)
diff --git a/test/lit/passes/O_fast-math.wast b/test/lit/passes/O_fast-math.wast
index 722f44a05..a964edc99 100644
--- a/test/lit/passes/O_fast-math.wast
+++ b/test/lit/passes/O_fast-math.wast
@@ -37,7 +37,7 @@
 
  ;; CHECK:      (export "abs_sub_zero2" (func $abs_sub_zero2))
 
- ;; CHECK:      (func $div (; has Stack IR ;) (result f32)
+ ;; CHECK:      (func $div (result f32)
  ;; CHECK-NEXT:  (f32.const -nan:0x23017a)
  ;; CHECK-NEXT: )
  (func $div (export "div") (result f32)
@@ -46,7 +46,7 @@
    (f32.const 1)
   )
  )
- ;; CHECK:      (func $mul1 (; has Stack IR ;) (result f32)
+ ;; CHECK:      (func $mul1 (result f32)
  ;; CHECK-NEXT:  (f32.const -nan:0x34546d)
  ;; CHECK-NEXT: )
  (func $mul1 (export "mul1") (result f32)
@@ -55,7 +55,7 @@
    (f32.const 1)
   )
  )
- ;; CHECK:      (func $mul2 (; has Stack IR ;) (result f32)
+ ;; CHECK:      (func $mul2 (result f32)
  ;; CHECK-NEXT:  (f32.const nan:0x400000)
  ;; CHECK-NEXT: )
  (func $mul2 (export "mul2") (result f32)
@@ -100,7 +100,7 @@
    (f32.const -0)
   )
  )
- ;; CHECK:      (func $mul_neg_one1 (; has Stack IR ;) (param $0 f32) (result f32)
+ ;; CHECK:      (func $mul_neg_one1 (param $0 f32) (result f32)
  ;; CHECK-NEXT:  (f32.neg
  ;; CHECK-NEXT:   (local.get $0)
  ;; CHECK-NEXT:  )
@@ -111,7 +111,7 @@
    (f32.const -1)
   )
  )
- ;; CHECK:      (func $mul_neg_one2 (; has Stack IR ;) (param $0 f64) (result f64)
+ ;; CHECK:      (func $mul_neg_one2 (param $0 f64) (result f64)
  ;; CHECK-NEXT:  (f64.neg
  ;; CHECK-NEXT:   (local.get $0)
  ;; CHECK-NEXT:  )
@@ -122,7 +122,7 @@
    (f64.const -1)
   )
  )
- ;; CHECK:      (func $abs_sub_zero1 (; has Stack IR ;) (param $0 f32) (result f32)
+ ;; CHECK:      (func $abs_sub_zero1 (param $0 f32) (result f32)
  ;; CHECK-NEXT:  (f32.abs
  ;; CHECK-NEXT:   (local.get $0)
  ;; CHECK-NEXT:  )
@@ -136,7 +136,7 @@
    )
   )
  )
- ;; CHECK:      (func $abs_sub_zero2 (; has Stack IR ;) (param $0 f64) (result f64)
+ ;; CHECK:      (func $abs_sub_zero2 (param $0 f64) (result f64)
  ;; CHECK-NEXT:  (f64.abs
  ;; CHECK-NEXT:   (local.get $0)
  ;; CHECK-NEXT:  )
diff --git a/test/lit/passes/Oz.wast b/test/lit/passes/Oz.wast
index 8c1db3083..eab5a95af 100644
--- a/test/lit/passes/Oz.wast
+++ b/test/lit/passes/Oz.wast
@@ -37,7 +37,7 @@
 
   ;; CHECK:      (export "precompute-simd" (func $precompute-simd))
 
-  ;; CHECK:      (func $basics (type $0) (; has Stack IR ;) (param $0 i32) (param $1 i32) (result i32)
+  ;; CHECK:      (func $basics (type $0) (param $0 i32) (param $1 i32) (result i32)
   ;; CHECK-NEXT:  (i32.add
   ;; CHECK-NEXT:   (local.tee $0
   ;; CHECK-NEXT:    (i32.add
@@ -59,7 +59,7 @@
     )
     (i32.add (local.get $x2) (local.get $y2))
   )
-  ;; CHECK:      (func $8 (type $2) (; has Stack IR ;) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
+  ;; CHECK:      (func $8 (type $2) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
   ;; CHECK-NEXT:  (i32.store
   ;; CHECK-NEXT:   (local.tee $0
   ;; CHECK-NEXT:    (i32.add
@@ -131,7 +131,7 @@
     )
   )
 
-  ;; CHECK:      (func $9 (type $1) (; has Stack IR ;) (param $0 i32) (result i32)
+  ;; CHECK:      (func $9 (type $1) (param $0 i32) (result i32)
   ;; CHECK-NEXT:  (i32.mul
   ;; CHECK-NEXT:   (local.get $0)
   ;; CHECK-NEXT:   (i32.const -4)
@@ -147,7 +147,7 @@
     )
   )
 
-  ;; CHECK:      (func $10 (type $1) (; has Stack IR ;) (param $0 i32) (result i32)
+  ;; CHECK:      (func $10 (type $1) (param $0 i32) (result i32)
   ;; CHECK-NEXT:  (i32.shl
   ;; CHECK-NEXT:   (local.get $0)
   ;; CHECK-NEXT:   (i32.const 31)
@@ -163,7 +163,7 @@
     )
   )
 
-  ;; CHECK:      (func $11 (type $1) (; has Stack IR ;) (param $0 i32) (result i32)
+  ;; CHECK:      (func $11 (type $1) (param $0 i32) (result i32)
   ;; CHECK-NEXT:  (if
   ;; CHECK-NEXT:   (local.get $0)
   ;; CHECK-NEXT:   (then
@@ -201,7 +201,7 @@
     )
     (i32.const 0)
   )
-  ;; CHECK:      (func $12 (type $0) (; has Stack IR ;) (param $0 i32) (param $1 i32) (result i32)
+  ;; CHECK:      (func $12 (type $0) (param $0 i32) (param $1 i32) (result i32)
   ;; CHECK-NEXT:  (if
   ;; CHECK-NEXT:   (local.get $0)
   ;; CHECK-NEXT:   (then
@@ -239,7 +239,7 @@
     )
     (i32.const 0)
   )
-  ;; CHECK:      (func $13 (type $0) (; has Stack IR ;) (param $0 i32) (param $1 i32) (result i32)
+  ;; CHECK:      (func $13 (type $0) (param $0 i32) (param $1 i32) (result i32)
   ;; CHECK-NEXT:  (if
   ;; CHECK-NEXT:   (select
   ;; CHECK-NEXT:    (local.get $1)
@@ -268,7 +268,7 @@
     (i32.const 0)
   )
 
-  ;; CHECK:      (func $14 (type $0) (; has Stack IR ;) (param $0 i32) (param $1 i32) (result i32)
+  ;; CHECK:      (func $14 (type $0) (param $0 i32) (param $1 i32) (result i32)
   ;; CHECK-NEXT:  (if
   ;; CHECK-NEXT:   (select
   ;; CHECK-NEXT:    (i32.const 0)
@@ -297,7 +297,7 @@
     (i32.const 0)
   )
 
-  ;; CHECK:      (func $precompute-simd (type $3) (; has Stack IR ;) (result v128)
+  ;; CHECK:      (func $precompute-simd (type $3) (result v128)
   ;; CHECK-NEXT:  (v128.const i32x4 0x00000000 0x00000000 0x00000000 0x00000000)
   ;; CHECK-NEXT: )
   (func $precompute-simd (export "precompute-simd") (result v128)
diff --git a/test/lit/passes/asyncify_mod-asyncify-always-and-only-unwind_O.wast b/test/lit/passes/asyncify_mod-asyncify-always-and-only-unwind_O.wast
index 99ac2c05f..ec31a4118 100644
--- a/test/lit/passes/asyncify_mod-asyncify-always-and-only-unwind_O.wast
+++ b/test/lit/passes/asyncify_mod-asyncify-always-and-only-unwind_O.wast
@@ -42,7 +42,7 @@
 
   ;; CHECK:      (export "asyncify_get_state" (func $asyncify_get_state))
 
-  ;; CHECK:      (func $calls-import (; has Stack IR ;)
+  ;; CHECK:      (func $calls-import
   ;; CHECK-NEXT:  (local $0 i32)
   ;; CHECK-NEXT:  (call $import)
   ;; CHECK-NEXT:  (i32.store
@@ -76,7 +76,7 @@
     (drop (i32.eqz (i32.const 17)))
   )
 )
-;; CHECK:      (func $asyncify_start_unwind (; has Stack IR ;) (param $0 i32)
+;; CHECK:      (func $asyncify_start_unwind (param $0 i32)
 ;; CHECK-NEXT:  (global.set $__asyncify_state
 ;; CHECK-NEXT:   (i32.const 1)
 ;; CHECK-NEXT:  )
@@ -98,7 +98,7 @@
 ;; CHECK-NEXT:  )
 ;; CHECK-NEXT: )
 
-;; CHECK:      (func $asyncify_stop_unwind (; has Stack IR ;)
+;; CHECK:      (func $asyncify_stop_unwind
 ;; CHECK-NEXT:  (global.set $__asyncify_state
 ;; CHECK-NEXT:   (i32.const 0)
 ;; CHECK-NEXT:  )
@@ -117,7 +117,7 @@
 ;; CHECK-NEXT:  )
 ;; CHECK-NEXT: )
 
-;; CHECK:      (func $asyncify_start_rewind (; has Stack IR ;) (param $0 i32)
+;; CHECK:      (func $asyncify_start_rewind (param $0 i32)
 ;; CHECK-NEXT:  (global.set $__asyncify_state
 ;; CHECK-NEXT:   (i32.const 2)
 ;; CHECK-NEXT:  )
@@ -139,6 +139,6 @@
 ;; CHECK-NEXT:  )
 ;; CHECK-NEXT: )
 
-;; CHECK:      (func $asyncify_get_state (; has Stack IR ;) (result i32)
+;; CHECK:      (func $asyncify_get_state (result i32)
 ;; CHECK-NEXT:  (global.get $__asyncify_state)
 ;; CHECK-NEXT: )
diff --git a/test/lit/passes/asyncify_mod-asyncify-never-unwind_O.wast b/test/lit/passes/asyncify_mod-asyncify-never-unwind_O.wast
index 38a54ea80..eefdabe34 100644
--- a/test/lit/passes/asyncify_mod-asyncify-never-unwind_O.wast
+++ b/test/lit/passes/asyncify_mod-asyncify-never-unwind_O.wast
@@ -41,7 +41,7 @@
 
   ;; CHECK:      (export "asyncify_get_state" (func $asyncify_get_state))
 
-  ;; CHECK:      (func $calls-import (; has Stack IR ;)
+  ;; CHECK:      (func $calls-import
   ;; CHECK-NEXT:  (if
   ;; CHECK-NEXT:   (i32.or
   ;; CHECK-NEXT:    (i32.eqz
@@ -95,7 +95,7 @@
     (drop (i32.eqz (i32.const 17)))
   )
 )
-;; CHECK:      (func $asyncify_start_unwind (; has Stack IR ;) (param $0 i32)
+;; CHECK:      (func $asyncify_start_unwind (param $0 i32)
 ;; CHECK-NEXT:  (global.set $__asyncify_state
 ;; CHECK-NEXT:   (i32.const 1)
 ;; CHECK-NEXT:  )
@@ -117,7 +117,7 @@
 ;; CHECK-NEXT:  )
 ;; CHECK-NEXT: )
 
-;; CHECK:      (func $asyncify_stop_unwind (; has Stack IR ;)
+;; CHECK:      (func $asyncify_stop_unwind
 ;; CHECK-NEXT:  (global.set $__asyncify_state
 ;; CHECK-NEXT:   (i32.const 0)
 ;; CHECK-NEXT:  )
@@ -136,7 +136,7 @@
 ;; CHECK-NEXT:  )
 ;; CHECK-NEXT: )
 
-;; CHECK:      (func $asyncify_start_rewind (; has Stack IR ;) (param $0 i32)
+;; CHECK:      (func $asyncify_start_rewind (param $0 i32)
 ;; CHECK-NEXT:  (global.set $__asyncify_state
 ;; CHECK-NEXT:   (i32.const 2)
 ;; CHECK-NEXT:  )
@@ -158,6 +158,6 @@
 ;; CHECK-NEXT:  )
 ;; CHECK-NEXT: )
 
-;; CHECK:      (func $asyncify_get_state (; has Stack IR ;) (result i32)
+;; CHECK:      (func $asyncify_get_state (result i32)
 ;; CHECK-NEXT:  (global.get $__asyncify_state)
 ;; CHECK-NEXT: )
diff --git a/test/lit/passes/flatten_dfo_O3_enable-threads.wast b/test/lit/passes/flatten_dfo_O3_enable-threads.wast
index 34142b73f..3e2dfb539 100644
--- a/test/lit/passes/flatten_dfo_O3_enable-threads.wast
+++ b/test/lit/passes/flatten_dfo_O3_enable-threads.wast
@@ -28,7 +28,7 @@
 
  ;; CHECK:      (export "dfo-tee-get" (func $dfo-tee-get))
 
- ;; CHECK:      (func $one (; has Stack IR ;)
+ ;; CHECK:      (func $one
  ;; CHECK-NEXT:  (block $label$3
  ;; CHECK-NEXT:   (br_if $label$3
  ;; CHECK-NEXT:    (i32.load
@@ -56,7 +56,7 @@
   )
   (unreachable)
  )
- ;; CHECK:      (func $two (; has Stack IR ;) (param $0 i32) (param $1 i32) (result i32)
+ ;; CHECK:      (func $two (param $0 i32) (param $1 i32) (result i32)
  ;; CHECK-NEXT:  (i32.const 0)
  ;; CHECK-NEXT: )
  (func $two (export "two") (param $var$0 i32) (param $var$1 i32) (result i32)
@@ -110,7 +110,7 @@
   (nop)
   (i32.const 0)
  )
- ;; CHECK:      (func $use-var (; has Stack IR ;) (param $0 i64) (param $1 i32) (result f64)
+ ;; CHECK:      (func $use-var (param $0 i64) (param $1 i32) (result f64)
  ;; CHECK-NEXT:  (loop $label$8
  ;; CHECK-NEXT:   (br_if $label$8
  ;; CHECK-NEXT:    (local.get $1)
@@ -184,7 +184,7 @@
   )
   (unreachable)
  )
- ;; CHECK:      (func $bad1 (; has Stack IR ;)
+ ;; CHECK:      (func $bad1
  ;; CHECK-NEXT:  (i32.store
  ;; CHECK-NEXT:   (i32.const 1)
  ;; CHECK-NEXT:   (i32.const -16384)
@@ -236,7 +236,7 @@
    )
   )
  )
- ;; CHECK:      (func $only-dfo (; has Stack IR ;) (param $0 f64) (result f64)
+ ;; CHECK:      (func $only-dfo (param $0 f64) (result f64)
  ;; CHECK-NEXT:  (local $1 i32)
  ;; CHECK-NEXT:  (loop $label$1
  ;; CHECK-NEXT:   (br $label$1)
@@ -270,7 +270,7 @@
    (br $label$1)
   )
  )
- ;; CHECK:      (func $dfo-tee-get (; has Stack IR ;) (result i32)
+ ;; CHECK:      (func $dfo-tee-get (result i32)
  ;; CHECK-NEXT:  (i32.const 1)
  ;; CHECK-NEXT: )
  (func $dfo-tee-get (export "dfo-tee-get") (result i32)
diff --git a/test/lit/passes/flatten_simplify-locals-nonesting_dfo_O3.wast b/test/lit/passes/flatten_simplify-locals-nonesting_dfo_O3.wast
index 142fabeea..2c033e0fe 100644
--- a/test/lit/passes/flatten_simplify-locals-nonesting_dfo_O3.wast
+++ b/test/lit/passes/flatten_simplify-locals-nonesting_dfo_O3.wast
@@ -25,7 +25,7 @@
 
  ;; CHECK:      (export "only-dfo" (func $only-dfo))
 
- ;; CHECK:      (func $if-select (; has Stack IR ;)
+ ;; CHECK:      (func $if-select
  ;; CHECK-NEXT:  (nop)
  ;; CHECK-NEXT: )
  (func $if-select (export "if-select")
@@ -47,7 +47,7 @@
    )
   )
  )
- ;; CHECK:      (func $unreachable-body-update-zext (; has Stack IR ;) (result f64)
+ ;; CHECK:      (func $unreachable-body-update-zext (result f64)
  ;; CHECK-NEXT:  (unreachable)
  ;; CHECK-NEXT: )
  (func $unreachable-body-update-zext (export "unreachable-body-update-zext") (result f64)
@@ -61,7 +61,7 @@
   )
   (f64.const -9223372036854775808)
  )
- ;; CHECK:      (func $ssa-const (; has Stack IR ;) (param $0 i32) (param $1 f64) (param $2 f64) (result i32)
+ ;; CHECK:      (func $ssa-const (param $0 i32) (param $1 f64) (param $2 f64) (result i32)
  ;; CHECK-NEXT:  (unreachable)
  ;; CHECK-NEXT: )
  (func $ssa-const (export "ssa-const") (param $var$0 i32) (param $var$1 f64) (param $var$2 f64) (result i32)
@@ -99,7 +99,7 @@
    )
   )
  )
- ;; CHECK:      (func $if-nothing (; has Stack IR ;) (param $0 i64)
+ ;; CHECK:      (func $if-nothing (param $0 i64)
  ;; CHECK-NEXT:  (unreachable)
  ;; CHECK-NEXT: )
  (func $if-nothing (export "if-nothing") (param $var$0 i64)
@@ -130,7 +130,7 @@
    (unreachable)
   )
  )
- ;; CHECK:      (func $only-dfo (; has Stack IR ;) (param $0 f64) (result i32)
+ ;; CHECK:      (func $only-dfo (param $0 f64) (result i32)
  ;; CHECK-NEXT:  (local $1 i32)
  ;; CHECK-NEXT:  (loop $label$1
  ;; CHECK-NEXT:   (if
diff --git a/test/lit/passes/global-effects-O.wast b/test/lit/passes/global-effects-O.wast
index c24159eac..c7ba06781 100644
--- a/test/lit/passes/global-effects-O.wast
+++ b/test/lit/passes/global-effects-O.wast
@@ -56,13 +56,13 @@
   ;; CHECK_1:      (func $main (type $0)
   ;; CHECK_1-NEXT:  (nop)
   ;; CHECK_1-NEXT: )
-  ;; CHECK_3:      (func $main (type $0) (; has Stack IR ;)
+  ;; CHECK_3:      (func $main (type $0)
   ;; CHECK_3-NEXT:  (nop)
   ;; CHECK_3-NEXT: )
-  ;; CHECK_s:      (func $main (type $0) (; has Stack IR ;)
+  ;; CHECK_s:      (func $main (type $0)
   ;; CHECK_s-NEXT:  (nop)
   ;; CHECK_s-NEXT: )
-  ;; CHECK_O:      (func $main (type $0) (; has Stack IR ;)
+  ;; CHECK_O:      (func $main (type $0)
   ;; CHECK_O-NEXT:  (nop)
   ;; CHECK_O-NEXT: )
   (func $main
@@ -119,7 +119,7 @@
   ;; CHECK_1-NEXT:   (local.get $0)
   ;; CHECK_1-NEXT:  )
   ;; CHECK_1-NEXT: )
-  ;; CHECK_3:      (func $pointless-work (type $1) (; has Stack IR ;) (result i32)
+  ;; CHECK_3:      (func $pointless-work (type $1) (result i32)
   ;; CHECK_3-NEXT:  (local $0 i32)
   ;; CHECK_3-NEXT:  (loop $loop (result i32)
   ;; CHECK_3-NEXT:   (br_if $loop
@@ -136,7 +136,7 @@
   ;; CHECK_3-NEXT:   (local.get $0)
   ;; CHECK_3-NEXT:  )
   ;; CHECK_3-NEXT: )
-  ;; CHECK_s:      (func $pointless-work (type $1) (; has Stack IR ;) (result i32)
+  ;; CHECK_s:      (func $pointless-work (type $1) (result i32)
   ;; CHECK_s-NEXT:  (local $0 i32)
   ;; CHECK_s-NEXT:  (loop $loop (result i32)
   ;; CHECK_s-NEXT:   (br_if $loop
@@ -153,7 +153,7 @@
   ;; CHECK_s-NEXT:   (local.get $0)
   ;; CHECK_s-NEXT:  )
   ;; CHECK_s-NEXT: )
-  ;; CHECK_O:      (func $pointless-work (type $1) (; has Stack IR ;) (result i32)
+  ;; CHECK_O:      (func $pointless-work (type $1) (result i32)
   ;; CHECK_O-NEXT:  (local $0 i32)
   ;; CHECK_O-NEXT:  (loop $loop (result i32)
   ;; CHECK_O-NEXT:   (br_if $loop
diff --git a/test/lit/passes/gto_and_cfp_in_O.wast b/test/lit/passes/gto_and_cfp_in_O.wast
index a723038eb..b1e9a47df 100644
--- a/test/lit/passes/gto_and_cfp_in_O.wast
+++ b/test/lit/passes/gto_and_cfp_in_O.wast
@@ -26,7 +26,7 @@
 
   ;; OPEN_WORLD:      (export "main" (func $main))
 
-  ;; OPEN_WORLD:      (func $by-ref (type $1) (; has Stack IR ;)
+  ;; OPEN_WORLD:      (func $by-ref (type $1)
   ;; OPEN_WORLD-NEXT:  (struct.set $struct 1
   ;; OPEN_WORLD-NEXT:   (global.get $glob)
   ;; OPEN_WORLD-NEXT:   (i32.const 200)
@@ -49,10 +49,10 @@
 
   ;; CHECK:      (export "main" (func $main))
 
-  ;; CHECK:      (func $main (type $0) (; has Stack IR ;) (result i32)
+  ;; CHECK:      (func $main (type $0) (result i32)
   ;; CHECK-NEXT:  (i32.const 100)
   ;; CHECK-NEXT: )
-  ;; OPEN_WORLD:      (func $main (type $2) (; has Stack IR ;) (result i32)
+  ;; OPEN_WORLD:      (func $main (type $2) (result i32)
   ;; OPEN_WORLD-NEXT:  (struct.get $struct 1
   ;; OPEN_WORLD-NEXT:   (global.get $glob)
   ;; OPEN_WORLD-NEXT:  )
diff --git a/test/lit/passes/type-ssa_and_merging.wast b/test/lit/passes/type-ssa_and_merging.wast
index 670de31ac..8928820bf 100644
--- a/test/lit/passes/type-ssa_and_merging.wast
+++ b/test/lit/passes/type-ssa_and_merging.wast
@@ -33,7 +33,7 @@
 
   ;; NOP:      (export "main2" (func $main2))
 
-  ;; NOP:      (func $main1 (type $2) (; has Stack IR ;) (result i32)
+  ;; NOP:      (func $main1 (type $2) (result i32)
   ;; NOP-NEXT:  (call $get-a-1
   ;; NOP-NEXT:   (struct.new $A
   ;; NOP-NEXT:    (i32.const 42)
@@ -57,7 +57,7 @@
     )
   )
 
-  ;; NOP:      (func $main2 (type $2) (; has Stack IR ;) (result i32)
+  ;; NOP:      (func $main2 (type $2) (result i32)
   ;; NOP-NEXT:  (call $get-a-2
   ;; NOP-NEXT:   (struct.new $A
   ;; NOP-NEXT:    (i32.const 1337)
@@ -77,7 +77,7 @@
     )
   )
 
-  ;; NOP:      (func $get-a-1 (type $0) (; has Stack IR ;) (param $0 (ref $A)) (result i32)
+  ;; NOP:      (func $get-a-1 (type $0) (param $0 (ref $A)) (result i32)
   ;; NOP-NEXT:  (if
   ;; NOP-NEXT:   (call $import)
   ;; NOP-NEXT:   (then
@@ -119,7 +119,7 @@
     (struct.get $A 0 (local.get 0))
   )
 
-  ;; NOP:      (func $get-a-2 (type $0) (; has Stack IR ;) (param $0 (ref $A)) (result i32)
+  ;; NOP:      (func $get-a-2 (type $0) (param $0 (ref $A)) (result i32)
   ;; NOP-NEXT:  (if
   ;; NOP-NEXT:   (call $import)
   ;; NOP-NEXT:   (then