1 files changed, 16 insertions, 16 deletions
diff --git a/test/passes/remove-unused-nonfunction-module-elements.txt b/test/passes/remove-unused-nonfunction-module-elements.txt
index bb1037d7a..556351afb 100644
--- a/test/passes/remove-unused-nonfunction-module-elements.txt
+++ b/test/passes/remove-unused-nonfunction-module-elements.txt
@@ -3,7 +3,7 @@
  (type $1 (func (param i32)))
  (type $2 (func (param i32) (result i32)))
  (memory $0 0)
- (table $0 1 1 anyfunc)
+ (table $0 1 1 funcref)
  (elem (i32.const 0) $called_indirect)
  (export "memory" (memory $0))
  (export "exported" (func $exported))
@@ -100,7 +100,7 @@
 )
 (module
  (import "env" "memory" (memory $0 256))
- (import "env" "table" (table $0 1 anyfunc))
+ (import "env" "table" (table $0 1 funcref))
  (export "mem" (memory $0))
  (export "tab" (table $0))
 )
@@ -108,7 +108,7 @@
  (type $0 (func))
  (import "env" "memory" (memory $0 256))
  (data (i32.const 1) "hello, world!")
- (import "env" "table" (table $0 1 anyfunc))
+ (import "env" "table" (table $0 1 funcref))
  (elem (i32.const 0) $waka)
  (func $waka (; 0 ;) (type $0)
   (nop)
@@ -117,7 +117,7 @@
 (module
  (type $0 (func))
  (import "env" "memory" (memory $0 256))
- (import "env" "table" (table $0 0 anyfunc))
+ (import "env" "table" (table $0 0 funcref))
  (export "user" (func $user))
  (func $user (; 0 ;) (type $0)
   (drop
@@ -157,7 +157,7 @@
  (memory $0 (shared 23 256))
  (export "user" (func $user))
  (func $user (; 0 ;) (type $0) (result i32)
-  (i32.atomic.rmw8_u.cmpxchg
+  (i32.atomic.rmw8.cmpxchg_u
    (i32.const 0)
    (i32.const 0)
    (i32.const 0)
@@ -173,9 +173,9 @@
   (local $1 i64)
   (drop
    (i32.wait
-    (get_local $0)
-    (get_local $0)
-    (get_local $1)
+    (local.get $0)
+    (local.get $0)
+    (local.get $1)
    )
   )
  )
@@ -222,9 +222,9 @@
 (module
  (type $0 (func))
  (import "env" "memory" (memory $0 256))
- (data (get_global $memoryBase) "hello, world!")
- (import "env" "table" (table $0 0 anyfunc))
- (elem (get_global $tableBase) $waka)
+ (data (global.get $memoryBase) "hello, world!")
+ (import "env" "table" (table $0 0 funcref))
+ (elem (global.get $tableBase) $waka)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (func $waka (; 0 ;) (type $0)
@@ -237,7 +237,7 @@
  (type $2 (func))
  (import "env" "imported" (global $imported i32))
  (import "env" "_puts" (func $_puts (param i32) (result i32)))
- (global $int (mut i32) (get_global $imported))
+ (global $int (mut i32) (global.get $imported))
  (global $set (mut i32) (i32.const 100))
  (global $exp_glob i32 (i32.const 600))
  (export "one" (func $one))
@@ -247,13 +247,13 @@
   (call $two)
  )
  (func $two (; 2 ;) (type $1) (result i32)
-  (get_global $int)
+  (global.get $int)
  )
  (func $three (; 3 ;) (type $2)
   (call $four)
  )
  (func $four (; 4 ;) (type $2)
-  (set_global $set
+  (global.set $set
    (i32.const 200)
   )
   (drop
@@ -299,7 +299,7 @@
 )
 (module
  (type $0 (func (param f64) (result f64)))
- (table $0 6 6 anyfunc)
+ (table $0 6 6 funcref)
  (func $0 (; 0 ;) (type $0) (param $var$0 f64) (result f64)
   (if (result f64)
    (f64.eq
@@ -316,7 +316,7 @@
 )
 (module
  (type $0 (func (param f64) (result f64)))
- (import "env" "table" (table $0 6 6 anyfunc))
+ (import "env" "table" (table $0 6 6 funcref))
  (elem (i32.const 0) $0)
  (func $0 (; 0 ;) (type $0) (param $var$0 f64) (result f64)
   (if (result f64)