1 files changed, 115 insertions, 115 deletions
diff --git a/test/passes/merge-locals.txt b/test/passes/merge-locals.txt
index 8d30ec119..8d61041e6 100644
--- a/test/passes/merge-locals.txt
+++ b/test/passes/merge-locals.txt
@@ -7,77 +7,77 @@
  (func $test (; 0 ;) (type $0) (param $x i32) (param $y i32) (result i32)
   (drop
    (if (result i32)
-    (tee_local $x
-     (get_local $y)
+    (local.tee $x
+     (local.get $y)
     )
     (i32.const 100)
-    (get_local $x)
+    (local.get $x)
    )
   )
-  (get_local $x)
+  (local.get $x)
  )
  (func $test2 (; 1 ;) (type $0) (param $x i32) (param $y i32) (result i32)
   (drop
    (if (result i32)
-    (tee_local $x
-     (get_local $y)
+    (local.tee $x
+     (local.get $y)
     )
     (i32.const 100)
-    (get_local $x)
+    (local.get $x)
    )
   )
-  (get_local $x)
+  (local.get $x)
  )
  (func $test-multiple (; 2 ;) (type $0) (param $x i32) (param $y i32) (result i32)
   (drop
    (if (result i32)
-    (tee_local $x
-     (get_local $y)
+    (local.tee $x
+     (local.get $y)
     )
     (i32.const 100)
-    (get_local $x)
+    (local.get $x)
    )
   )
   (drop
-   (get_local $x)
+   (local.get $x)
   )
-  (get_local $x)
+  (local.get $x)
  )
  (func $test-just-some (; 3 ;) (type $0) (param $x i32) (param $y i32) (result i32)
   (drop
    (if (result i32)
-    (tee_local $x
-     (get_local $y)
+    (local.tee $x
+     (local.get $y)
     )
     (i32.const 100)
-    (get_local $x)
+    (local.get $x)
    )
   )
   (drop
-   (get_local $x)
+   (local.get $x)
   )
-  (set_local $y
+  (local.set $y
    (i32.const 200)
   )
-  (get_local $y)
+  (local.get $y)
  )
  (func $test-just-some2 (; 4 ;) (type $0) (param $x i32) (param $y i32) (result i32)
   (drop
    (if (result i32)
-    (tee_local $x
-     (get_local $y)
+    (local.tee $x
+     (local.get $y)
     )
     (i32.const 100)
-    (get_local $x)
+    (local.get $x)
    )
   )
   (if
    (i32.const 300)
-   (set_local $y
+   (local.set $y
     (i32.const 400)
    )
    (drop
-    (get_local $x)
+    (local.get $x)
    )
   )
   (i32.const 500)
@@ -85,8 +85,8 @@
  (func $test-just-some3 (; 5 ;) (type $0) (param $x i32) (param $y i32) (result i32)
   (drop
    (if (result i32)
-    (tee_local $x
-     (get_local $y)
+    (local.tee $x
+     (local.get $y)
     )
     (i32.const 100)
     (i32.const 200)
@@ -94,176 +94,176 @@
   )
   (if
    (i32.const 300)
-   (set_local $y
+   (local.set $y
     (i32.const 400)
    )
    (drop
-    (get_local $y)
+    (local.get $y)
    )
   )
-  (get_local $y)
+  (local.get $y)
  )
  (func $silly-self (; 6 ;) (type $0) (param $x i32) (param $y i32) (result i32)
   (drop
    (if (result i32)
-    (tee_local $x
-     (get_local $x)
+    (local.tee $x
+     (local.get $x)
     )
     (i32.const 100)
-    (get_local $x)
+    (local.get $x)
    )
   )
-  (get_local $y)
+  (local.get $y)
  )
  (func $silly-multi (; 7 ;) (type $0) (param $x i32) (param $y i32) (result i32)
   (drop
    (if (result i32)
-    (tee_local $x
-     (tee_local $y
-      (get_local $x)
+    (local.tee $x
+     (local.tee $y
+      (local.get $x)
      )
     )
     (i32.const 100)
-    (get_local $x)
+    (local.get $x)
    )
   )
-  (get_local $y)
+  (local.get $y)
  )
  (func $undo-1 (; 8 ;) (type $1) (param $var$1 i32) (param $var$2 i32)
   (local $var$5 i32)
-  (set_local $var$2
-   (get_local $var$1)
+  (local.set $var$2
+   (local.get $var$1)
   )
-  (set_local $var$2
+  (local.set $var$2
    (i32.const 1)
   )
   (drop
-   (get_local $var$1)
+   (local.get $var$1)
   )
  )
  (func $undo-2 (; 9 ;) (type $1) (param $var$1 i32) (param $var$2 i32)
   (local $var$5 i32)
-  (set_local $var$2
-   (get_local $var$1)
+  (local.set $var$2
+   (local.get $var$1)
   )
   (if
-   (get_local $var$1)
-   (set_local $var$2
+   (local.get $var$1)
+   (local.set $var$2
     (i32.const 1)
    )
   )
   (drop
-   (get_local $var$1)
+   (local.get $var$1)
   )
  )
  (func $reverse (; 10 ;) (type $1) (param $x i32) (param $y i32)
   (drop
    (if (result i32)
-    (tee_local $x
-     (get_local $y)
+    (local.tee $x
+     (local.get $y)
     )
     (i32.const 100)
-    (get_local $y)
+    (local.get $y)
    )
   )
   (drop
-   (get_local $y)
+   (local.get $y)
   )
   (if
    (i32.const 1)
-   (set_local $y
+   (local.set $y
     (i32.const 200)
    )
   )
   (drop
-   (get_local $y)
+   (local.get $y)
   )
  )
  (func $reverse-end (; 11 ;) (type $1) (param $x i32) (param $y i32)
   (drop
    (if (result i32)
-    (tee_local $x
-     (get_local $y)
+    (local.tee $x
+     (local.get $y)
     )
     (i32.const 100)
-    (get_local $x)
+    (local.get $x)
    )
   )
  )
  (func $reverse-lone-end-2 (; 12 ;) (type $1) (param $x i32) (param $y i32)
   (drop
    (if (result i32)
-    (tee_local $x
-     (get_local $y)
+    (local.tee $x
+     (local.get $y)
     )
     (i32.const 100)
-    (get_local $x)
+    (local.get $x)
    )
   )
-  (set_local $y
+  (local.set $y
    (i32.const 200)
   )
   (drop
-   (get_local $y)
+   (local.get $y)
   )
  )
  (func $reverse-undo (; 13 ;) (type $1) (param $x i32) (param $y i32)
   (drop
    (if (result i32)
-    (tee_local $x
-     (get_local $y)
+    (local.tee $x
+     (local.get $y)
     )
     (i32.const 100)
-    (get_local $y)
+    (local.get $y)
    )
   )
-  (set_local $x
+  (local.set $x
    (i32.const 300)
   )
   (drop
-   (get_local $x)
+   (local.get $x)
   )
   (if
    (i32.const 1)
-   (set_local $y
+   (local.set $y
     (i32.const 200)
    )
   )
   (drop
-   (get_local $y)
+   (local.get $y)
   )
  )
  (func $reverse-undo2 (; 14 ;) (type $1) (param $x i32) (param $y i32)
   (drop
    (if (result i32)
-    (tee_local $x
-     (get_local $y)
+    (local.tee $x
+     (local.get $y)
     )
     (i32.const 100)
     (i32.const 150)
    )
   )
-  (set_local $x
+  (local.set $x
    (i32.const 300)
   )
   (drop
-   (get_local $x)
+   (local.get $x)
   )
   (if
    (i32.const 1)
-   (set_local $y
+   (local.set $y
     (i32.const 200)
    )
   )
   (drop
-   (get_local $y)
+   (local.get $y)
   )
  )
  (func $reverse-undo3-conditional (; 15 ;) (type $1) (param $x i32) (param $y i32)
   (drop
    (if (result i32)
-    (tee_local $x
-     (get_local $y)
+    (local.tee $x
+     (local.get $y)
     )
     (i32.const 100)
     (i32.const 150)
@@ -271,57 +271,57 @@
   )
   (if
    (i32.const 1)
-   (set_local $x
+   (local.set $x
     (i32.const 300)
    )
   )
   (drop
-   (get_local $x)
+   (local.get $x)
   )
   (if
    (i32.const 1)
-   (set_local $y
+   (local.set $y
     (i32.const 200)
    )
   )
   (drop
-   (get_local $y)
+   (local.get $y)
   )
  )
  (func $reverse-undo3-conditional-b (; 16 ;) (type $1) (param $x i32) (param $y i32)
   (drop
    (if (result i32)
-    (tee_local $x
-     (get_local $y)
+    (local.tee $x
+     (local.get $y)
     )
     (i32.const 100)
-    (get_local $x)
+    (local.get $x)
    )
   )
   (if
    (i32.const 1)
-   (set_local $x
+   (local.set $x
     (i32.const 300)
    )
   )
   (drop
-   (get_local $x)
+   (local.get $x)
   )
   (if
    (i32.const 1)
-   (set_local $y
+   (local.set $y
     (i32.const 200)
    )
   )
   (drop
-   (get_local $y)
+   (local.get $y)
   )
  )
  (func $reverse-undo3-conditional-c (; 17 ;) (type $1) (param $x i32) (param $y i32)
   (drop
    (if (result i32)
-    (tee_local $x
-     (get_local $y)
+    (local.tee $x
+     (local.get $y)
     )
     (i32.const 100)
     (i32.const 150)
@@ -330,42 +330,42 @@
   (if
    (i32.const 1)
    (drop
-    (get_local $x)
+    (local.get $x)
    )
    (block $block
     (if
      (i32.const 1)
-     (set_local $x
+     (local.set $x
       (i32.const 300)
      )
     )
     (drop
-     (get_local $x)
+     (local.get $x)
     )
    )
   )
   (if
    (i32.const 1)
-   (set_local $y
+   (local.set $y
     (i32.const 200)
    )
   )
   (drop
-   (get_local $y)
+   (local.get $y)
   )
  )
  (func $fuzz (; 18 ;) (type $2) (param $var$0 i32) (param $var$1 f32) (param $var$2 f32) (result i64)
   (local $var$3 i32)
-  (set_global $global$0
+  (global.set $global$0
    (i32.sub
-    (get_global $global$0)
+    (global.get $global$0)
     (i32.const 1)
    )
   )
   (loop $label$1 (result i64)
-   (set_global $global$0
+   (global.set $global$0
     (i32.sub
-     (get_global $global$0)
+     (global.get $global$0)
      (i32.const 1)
     )
    )
@@ -374,52 +374,52 @@
      (drop
       (if (result i32)
        (block $label$3 (result i32)
-        (set_global $global$0
+        (global.set $global$0
          (i32.sub
-          (get_global $global$0)
+          (global.get $global$0)
           (i32.const 3)
          )
         )
-        (set_local $var$3
+        (local.set $var$3
          (i32.const 1)
         )
-        (tee_local $var$3
-         (get_local $var$0)
+        (local.tee $var$3
+         (local.get $var$0)
         )
        )
        (i32.const 0)
        (block $block (result i32)
-        (set_local $var$3
+        (local.set $var$3
          (if (result i32)
           (i32.const 0)
           (block $block13 (result i32)
            (block $label$7
             (block $label$8
-             (set_local $var$0
+             (local.set $var$0
               (i32.const 34738786)
              )
             )
            )
-           (get_local $var$3)
+           (local.get $var$3)
           )
           (block $block14 (result i32)
            (if
             (i32.eqz
-             (get_global $global$0)
+             (global.get $global$0)
             )
             (return
              (i64.const 137438953472)
             )
            )
-           (set_global $global$0
+           (global.set $global$0
             (i32.sub
-             (get_global $global$0)
+             (global.get $global$0)
              (i32.const 1)
             )
            )
            (br_if $label$1
             (i32.eqz
-             (get_local $var$3)
+             (local.get $var$3)
             )
            )
            (return
@@ -443,15 +443,15 @@
    (if
     (i32.const 1)
     (drop
-     (get_local $result)
+     (local.get $result)
     )
    )
-   (set_local $result
-    (get_local $param)
+   (local.set $result
+    (local.get $param)
    )
    (br_if $label$1
-    (tee_local $unused
-     (get_local $param)
+    (local.tee $unused
+     (local.get $param)
     )
    )
   )