1 files changed, 369 insertions, 369 deletions

diff --git a/test/passes/optimize-instructions.txt b/test/passes/optimize-instructions.txt
index 0e8654e48..c16409cd4 100644
--- a/test/passes/optimize-instructions.txt
+++ b/test/passes/optimize-instructions.txt
@@ -18,14 +18,14 @@
  (func $f (; 0 ;) (type $0) (param $i1 i32) (param $i2 i64)
   (if
    (i32.eqz
-    (get_local $i1)
+    (local.get $i1)
    )
    (drop
     (i32.const 10)
    )
   )
   (if
-   (get_local $i1)
+   (local.get $i1)
    (drop
     (i32.const 12)
    )
@@ -35,7 +35,7 @@
   )
   (if
    (i64.eqz
-    (get_local $i2)
+    (local.get $i2)
    )
    (drop
     (i32.const 11)
@@ -204,19 +204,19 @@
    (select
     (i32.const 102)
     (i32.const 101)
-    (get_local $i1)
+    (local.get $i1)
    )
   )
   (drop
    (select
-    (tee_local $i1
+    (local.tee $i1
      (i32.const 103)
     )
-    (tee_local $i1
+    (local.tee $i1
      (i32.const 104)
     )
     (i32.eqz
-     (get_local $i1)
+     (local.get $i1)
     )
    )
   )
@@ -380,34 +380,34 @@
   )
   (drop
    (i32.and
-    (get_local $x)
+    (local.get $x)
     (i32.const 3)
    )
   )
   (drop
    (i32.and
-    (get_local $x)
+    (local.get $x)
     (i32.const 4)
    )
   )
   (drop
    (i32.and
-    (get_local $x)
-    (get_local $y)
+    (local.get $x)
+    (local.get $y)
    )
   )
   (drop
    (i32.and
-    (get_local $x)
-    (get_local $y)
+    (local.get $x)
+    (local.get $y)
    )
   )
   (drop
    (i32.and
-    (tee_local $x
+    (local.tee $x
      (i32.const -4)
     )
-    (get_local $y)
+    (local.get $y)
    )
   )
   (drop
@@ -415,7 +415,7 @@
     (block $block (result i32)
      (i32.const -5)
     )
-    (get_local $x)
+    (local.get $x)
    )
   )
   (drop
@@ -423,7 +423,7 @@
     (block $block3 (result i32)
      (i32.const -6)
     )
-    (get_local $x)
+    (local.get $x)
    )
   )
   (drop
@@ -497,7 +497,7 @@
     (block $block15 (result i32)
      (i32.const 15)
     )
-    (get_local $x)
+    (local.get $x)
    )
   )
   (drop
@@ -505,7 +505,7 @@
     (block $block16 (result i32)
      (i32.const 15)
     )
-    (get_local $x)
+    (local.get $x)
    )
   )
   (drop
@@ -535,40 +535,40 @@
   (drop
    (i32.add
     (i32.ctz
-     (get_local $x)
+     (local.get $x)
     )
     (i32.ctz
-     (get_local $y)
+     (local.get $y)
     )
    )
   )
   (drop
    (i32.add
     (i32.ctz
-     (get_local $y)
+     (local.get $y)
     )
     (i32.ctz
-     (get_local $x)
+     (local.get $x)
     )
    )
   )
   (drop
    (i32.add
     (i32.ctz
-     (get_local $x)
+     (local.get $x)
     )
     (i32.eqz
-     (get_local $y)
+     (local.get $y)
     )
    )
   )
   (drop
    (i32.add
     (i32.ctz
-     (get_local $y)
+     (local.get $y)
     )
     (i32.eqz
-     (get_local $x)
+     (local.get $x)
     )
    )
   )
@@ -627,55 +627,55 @@
  (func $load-off-2 (; 8 ;) (type $4) (param $0 i32) (result i32)
   (i32.store
    (i32.const 6)
-   (get_local $0)
+   (local.get $0)
   )
   (i32.store
    (i32.const 6)
-   (get_local $0)
+   (local.get $0)
   )
   (i32.store offset=2
    (i32.add
-    (get_local $0)
+    (local.get $0)
     (i32.const 5)
    )
-   (get_local $0)
+   (local.get $0)
   )
   (i32.store offset=2
    (i32.add
-    (get_local $0)
+    (local.get $0)
     (i32.const 7)
    )
-   (get_local $0)
+   (local.get $0)
   )
   (i32.store offset=2
    (i32.add
-    (get_local $0)
+    (local.get $0)
     (i32.const -11)
    )
-   (get_local $0)
+   (local.get $0)
   )
   (i32.store offset=2
    (i32.add
-    (get_local $0)
+    (local.get $0)
     (i32.const -13)
    )
-   (get_local $0)
+   (local.get $0)
   )
   (i32.store
    (i32.const 4)
-   (get_local $0)
+   (local.get $0)
   )
   (i32.store offset=2
    (i32.const -2)
-   (get_local $0)
+   (local.get $0)
   )
   (i32.store
    (i32.const 25)
-   (get_local $0)
+   (local.get $0)
   )
   (i32.store offset=2
    (i32.const -25)
-   (get_local $0)
+   (local.get $0)
   )
   (drop
    (i32.load
@@ -690,7 +690,7 @@
   (drop
    (i32.load offset=2
     (i32.add
-     (get_local $0)
+     (local.get $0)
      (i32.const 6)
     )
    )
@@ -702,7 +702,7 @@
   )
   (i32.load offset=2
    (i32.add
-    (get_local $0)
+    (local.get $0)
     (i32.const 10)
    )
   )
@@ -711,7 +711,7 @@
   (drop
    (i32.eqz
     (i32.and
-     (get_local $0)
+     (local.get $0)
      (i32.const 255)
     )
    )
@@ -719,7 +719,7 @@
   (drop
    (i32.eqz
     (i32.and
-     (get_local $0)
+     (local.get $0)
      (i32.const 65535)
     )
    )
@@ -727,7 +727,7 @@
   (drop
    (i32.eqz
     (i32.and
-     (get_local $0)
+     (local.get $0)
      (i32.const 134217727)
     )
    )
@@ -735,7 +735,7 @@
   (drop
    (i32.eq
     (i32.and
-     (get_local $0)
+     (local.get $0)
      (i32.const 255)
     )
     (i32.const 100)
@@ -744,7 +744,7 @@
   (drop
    (i32.eq
     (i32.and
-     (get_local $0)
+     (local.get $0)
      (i32.const 255)
     )
     (i32.const -2147483648)
@@ -753,7 +753,7 @@
   (drop
    (i32.eq
     (i32.and
-     (get_local $0)
+     (local.get $0)
      (i32.const 255)
     )
     (i32.const 107)
@@ -762,11 +762,11 @@
   (drop
    (i32.eq
     (i32.and
-     (get_local $0)
+     (local.get $0)
      (i32.const 255)
     )
     (i32.and
-     (get_local $1)
+     (local.get $1)
      (i32.const 255)
     )
    )
@@ -774,11 +774,11 @@
   (drop
    (i32.eq
     (i32.and
-     (get_local $0)
+     (local.get $0)
      (i32.const 65535)
     )
     (i32.and
-     (get_local $1)
+     (local.get $1)
      (i32.const 65535)
     )
    )
@@ -787,7 +787,7 @@
    (i32.eqz
     (i32.shr_s
      (i32.shl
-      (get_local $0)
+      (local.get $0)
       (i32.const 24)
      )
      (i32.const 23)
@@ -798,7 +798,7 @@
    (i32.eqz
     (i32.shr_u
      (i32.shl
-      (get_local $0)
+      (local.get $0)
       (i32.const 24)
      )
      (i32.const 24)
@@ -809,7 +809,7 @@
    (i32.lt_s
     (i32.shr_s
      (i32.shl
-      (get_local $0)
+      (local.get $0)
       (i32.const 24)
      )
      (i32.const 24)
@@ -837,7 +837,7 @@
   (drop
    (i32.shr_s
     (i32.shl
-     (get_local $0)
+     (local.get $0)
      (i32.const 24)
     )
     (i32.const 24)
@@ -1048,7 +1048,7 @@
    )
   )
   (drop
-   (i32.wrap/i64
+   (i32.wrap_i64
     (i64.clz
      (i64.const 0)
     )
@@ -1057,7 +1057,7 @@
   (drop
    (i32.shr_s
     (i32.shl
-     (i32.wrap/i64
+     (i32.wrap_i64
       (i64.clz
        (i64.const 0)
       )
@@ -1070,7 +1070,7 @@
   (drop
    (i32.shr_s
     (i32.shl
-     (i32.wrap/i64
+     (i32.wrap_i64
       (i64.clz
        (i64.const 0)
       )
@@ -1089,7 +1089,7 @@
    (i32.shr_s
     (i32.shl
      (i32.shr_u
-      (i32.wrap/i64
+      (i32.wrap_i64
        (i64.const -1)
       )
       (i32.const 24)
@@ -1101,7 +1101,7 @@
   )
   (drop
    (i32.shr_u
-    (i32.wrap/i64
+    (i32.wrap_i64
      (i64.const -1)
     )
     (i32.const 25)
@@ -1111,8 +1111,8 @@
    (i32.shr_s
     (i32.shl
      (i32.shr_u
-      (i32.wrap/i64
-       (i64.extend_s/i32
+      (i32.wrap_i64
+       (i64.extend_i32_s
         (i32.const -1)
        )
       )
@@ -1125,8 +1125,8 @@
   )
   (drop
    (i32.shr_u
-    (i32.wrap/i64
-     (i64.extend_s/i32
+    (i32.wrap_i64
+     (i64.extend_i32_s
       (i32.const -1)
      )
     )
@@ -1137,9 +1137,9 @@
    (i32.shr_s
     (i32.shl
      (i32.xor
-      (get_local $0)
+      (local.get $0)
       (i32.le_u
-       (get_local $0)
+       (local.get $0)
        (i32.const 2)
       )
      )
@@ -1153,18 +1153,18 @@
   (drop
    (i32.add
     (i32.shl
-     (get_local $0)
+     (local.get $0)
      (i32.const 4)
     )
-    (get_local $1)
+    (local.get $1)
    )
   )
   (drop
    (i32.add
     (i32.add
-     (get_local $1)
+     (local.get $1)
      (i32.shl
-      (get_local $0)
+      (local.get $0)
       (i32.const 3)
      )
     )
@@ -1202,7 +1202,7 @@
    (i32.add
     (i32.shl
      (i32.const 1)
-     (get_local $0)
+     (local.get $0)
     )
     (i32.const 14)
    )
@@ -1210,7 +1210,7 @@
   (drop
    (i32.add
     (i32.shl
-     (get_local $1)
+     (local.get $1)
      (i32.const 3)
     )
     (i32.const -66)
@@ -1222,7 +1222,7 @@
   (drop
    (i32.add
     (i32.mul
-     (get_local $0)
+     (local.get $0)
      (i32.const 10)
     )
     (i32.const 14)
@@ -1231,14 +1231,14 @@
   (drop
    (i32.add
     (i32.shl
-     (get_local $0)
+     (local.get $0)
      (i32.const 1)
     )
     (i32.const 34)
    )
   )
   (drop
-   (get_local $0)
+   (local.get $0)
   )
  )
  (func $almost-sign-ext (; 12 ;) (type $5) (param $0 i32) (param $0 i32)
@@ -1261,53 +1261,53 @@
  (func $squaring (; 13 ;) (type $5) (param $0 i32) (param $1 i32)
   (drop
    (i32.and
-    (get_local $0)
+    (local.get $0)
     (i32.const 8)
    )
   )
   (drop
    (i32.and
-    (get_local $0)
+    (local.get $0)
     (i32.and
-     (get_local $0)
+     (local.get $0)
      (i32.const 11)
     )
    )
   )
   (drop
    (i32.and
-    (get_local $0)
+    (local.get $0)
     (i32.const 8)
    )
   )
   (drop
    (i32.or
-    (get_local $0)
+    (local.get $0)
     (i32.const 203)
    )
   )
   (drop
    (i32.shl
-    (get_local $0)
+    (local.get $0)
     (i32.const 19)
    )
   )
   (drop
    (i32.shr_s
-    (get_local $0)
+    (local.get $0)
     (i32.const 19)
    )
   )
   (drop
    (i32.shr_u
-    (get_local $0)
+    (local.get $0)
     (i32.const 19)
    )
   )
   (drop
    (i32.shr_u
     (i32.shr_s
-     (get_local $0)
+     (local.get $0)
      (i32.const 11)
     )
     (i32.const 200)
@@ -1318,7 +1318,7 @@
   (drop
    (i32.ne
     (i32.and
-     (get_local $0)
+     (local.get $0)
      (i32.const 255)
     )
     (i32.const -2147483648)
@@ -1327,7 +1327,7 @@
   (drop
    (i32.ne
     (i32.and
-     (get_local $0)
+     (local.get $0)
      (i32.const 255)
     )
     (i32.const -2147483648)
@@ -1336,7 +1336,7 @@
   (drop
    (i32.ne
     (i32.and
-     (get_local $0)
+     (local.get $0)
      (i32.const 255)
     )
     (i32.const 107)
@@ -1345,7 +1345,7 @@
   (drop
    (i32.ne
     (i32.and
-     (get_local $0)
+     (local.get $0)
      (i32.const 255)
     )
     (i32.const 111)
@@ -1354,11 +1354,11 @@
   (drop
    (i32.ne
     (i32.and
-     (get_local $0)
+     (local.get $0)
      (i32.const 255)
     )
     (i32.and
-     (get_local $1)
+     (local.get $1)
      (i32.const 255)
     )
    )
@@ -1368,7 +1368,7 @@
   (drop
    (i32.eqz
     (i32.and
-     (get_local $0)
+     (local.get $0)
      (i32.const 255)
     )
    )
@@ -1378,7 +1378,7 @@
   (drop
    (if (result i32)
     (i32.and
-     (get_local $0)
+     (local.get $0)
      (i32.const 255)
     )
     (i32.const 100)
@@ -1388,22 +1388,22 @@
  )
  (func $add-sub-zero (; 17 ;) (type $5) (param $0 i32) (param $1 i32)
   (drop
-   (get_local $0)
+   (local.get $0)
   )
   (drop
-   (get_local $0)
+   (local.get $0)
   )
  )
  (func $store-signext (; 18 ;) (type $6) (param $0 i32)
   (i32.store8
    (i32.const 8)
-   (get_local $0)
+   (local.get $0)
   )
   (i32.store8
    (i32.const 8)
    (i32.shr_s
     (i32.shl
-     (get_local $0)
+     (local.get $0)
      (i32.const 25)
     )
     (i32.const 25)
@@ -1411,17 +1411,17 @@
   )
   (i32.store8
    (i32.const 8)
-   (get_local $0)
+   (local.get $0)
   )
   (i32.store16
    (i32.const 8)
-   (get_local $0)
+   (local.get $0)
   )
   (i32.store16
    (i32.const 8)
    (i32.shr_s
     (i32.shl
-     (get_local $0)
+     (local.get $0)
      (i32.const 17)
     )
     (i32.const 17)
@@ -1429,13 +1429,13 @@
   )
   (i32.store16
    (i32.const 8)
-   (get_local $0)
+   (local.get $0)
   )
   (i32.store
    (i32.const 8)
    (i32.shr_s
     (i32.shl
-     (get_local $0)
+     (local.get $0)
      (i32.const 16)
     )
     (i32.const 16)
@@ -1445,7 +1445,7 @@
    (i32.const 8)
    (i32.shr_s
     (i32.shl
-     (get_local $0)
+     (local.get $0)
      (i32.const 8)
     )
     (i32.const 8)
@@ -1456,7 +1456,7 @@
   (drop
    (i32.shr_s
     (i32.shl
-     (tee_local $0
+     (local.tee $0
       (i32.const 128)
      )
      (i32.const 24)
@@ -1465,7 +1465,7 @@
    )
   )
   (drop
-   (tee_local $0
+   (local.tee $0
     (i32.const 127)
    )
   )
@@ -1504,7 +1504,7 @@
    )
   )
   (drop
-   (tee_local $1
+   (local.tee $1
     (i32.load8_s
      (i32.const 1)
     )
@@ -1513,7 +1513,7 @@
   (drop
    (i32.shr_s
     (i32.shl
-     (tee_local $1
+     (local.tee $1
       (i32.load8_u
        (i32.const 1)
       )
@@ -1525,7 +1525,7 @@
   )
   (drop
    (i32.and
-    (tee_local $1
+    (local.tee $1
      (i32.load8_s
       (i32.const 1)
      )
@@ -1534,7 +1534,7 @@
    )
   )
   (drop
-   (tee_local $1
+   (local.tee $1
     (i32.load8_u
      (i32.const 1)
     )
@@ -1543,18 +1543,18 @@
  )
  (func $mask-bits (; 21 ;) (type $5) (param $0 i32) (param $1 i32)
   (drop
-   (tee_local $0
+   (local.tee $0
     (i32.const 127)
    )
   )
   (drop
-   (tee_local $0
+   (local.tee $0
     (i32.const 128)
    )
   )
   (drop
    (i32.and
-    (tee_local $0
+    (local.tee $0
      (i32.const 128)
     )
     (i32.const 254)
@@ -1562,7 +1562,7 @@
   )
   (drop
    (i32.and
-    (tee_local $0
+    (local.tee $0
      (i32.const 128)
     )
     (i32.const 1279)
@@ -1570,25 +1570,25 @@
   )
   (drop
    (i32.and
-    (tee_local $0
+    (local.tee $0
      (i32.const 128)
     )
     (i32.const 1290)
    )
   )
   (drop
-   (tee_local $0
+   (local.tee $0
     (i32.const 128)
    )
   )
   (drop
-   (tee_local $0
+   (local.tee $0
     (i32.const 128)
    )
   )
   (drop
    (i32.and
-    (tee_local $0
+    (local.tee $0
      (i32.const 128)
     )
     (i32.const 127)
@@ -1600,48 +1600,48 @@
   (local $y i32)
   (local $z i32)
   (local $w i32)
-  (set_local $x
+  (local.set $x
    (i32.const 212)
   )
   (drop
-   (get_local $x)
+   (local.get $x)
   )
-  (set_local $y
+  (local.set $y
    (i32.const 500)
   )
   (drop
    (i32.and
-    (get_local $y)
+    (local.get $y)
     (i32.const 255)
    )
   )
-  (set_local $0
+  (local.set $0
    (i32.const 212)
   )
   (drop
    (i32.and
-    (get_local $0)
+    (local.get $0)
     (i32.const 255)
    )
   )
-  (set_local $z
+  (local.set $z
    (i32.const 212)
   )
-  (set_local $z
+  (local.set $z
    (i32.const 220)
   )
   (drop
-   (get_local $z)
+   (local.get $z)
   )
-  (set_local $w
+  (local.set $w
    (i32.const 212)
   )
-  (set_local $w
+  (local.set $w
    (i32.const 1000)
   )
   (drop
    (i32.and
-    (get_local $w)
+    (local.get $w)
     (i32.const 255)
    )
   )
@@ -1651,55 +1651,55 @@
   (local $y i32)
   (local $z i32)
   (local $w i32)
-  (set_local $x
+  (local.set $x
    (i32.const 127)
   )
   (drop
-   (get_local $x)
+   (local.get $x)
   )
-  (set_local $y
+  (local.set $y
    (i32.const 128)
   )
   (drop
    (i32.shr_s
     (i32.shl
-     (get_local $y)
+     (local.get $y)
      (i32.const 24)
     )
     (i32.const 24)
    )
   )
-  (set_local $0
+  (local.set $0
    (i32.const 127)
   )
   (drop
    (i32.shr_s
     (i32.shl
-     (get_local $0)
+     (local.get $0)
      (i32.const 24)
     )
     (i32.const 24)
    )
   )
-  (set_local $z
+  (local.set $z
    (i32.const 127)
   )
-  (set_local $z
+  (local.set $z
    (i32.const 100)
   )
   (drop
-   (get_local $z)
+   (local.get $z)
   )
-  (set_local $w
+  (local.set $w
    (i32.const 127)
   )
-  (set_local $w
+  (local.set $w
    (i32.const 150)
   )
   (drop
    (i32.shr_s
     (i32.shl
-     (get_local $w)
+     (local.get $w)
      (i32.const 24)
     )
     (i32.const 24)
@@ -1711,22 +1711,22 @@
   (local $y i32)
   (local $z i32)
   (local $w i32)
-  (set_local $x
+  (local.set $x
    (i32.shr_s
     (i32.shl
-     (get_local $0)
+     (local.get $0)
      (i32.const 24)
     )
     (i32.const 24)
    )
   )
   (drop
-   (get_local $x)
+   (local.get $x)
   )
-  (set_local $y
+  (local.set $y
    (i32.shr_s
     (i32.shl
-     (get_local $0)
+     (local.get $0)
      (i32.const 16)
     )
     (i32.const 16)
@@ -1735,16 +1735,16 @@
   (drop
    (i32.shr_s
     (i32.shl
-     (get_local $y)
+     (local.get $y)
      (i32.const 24)
     )
     (i32.const 24)
    )
   )
-  (set_local $0
+  (local.set $0
    (i32.shr_s
     (i32.shl
-     (get_local $0)
+     (local.get $0)
      (i32.const 24)
     )
     (i32.const 24)
@@ -1753,46 +1753,46 @@
   (drop
    (i32.shr_s
     (i32.shl
-     (get_local $0)
+     (local.get $0)
      (i32.const 24)
     )
     (i32.const 24)
    )
   )
-  (set_local $z
+  (local.set $z
    (i32.shr_s
     (i32.shl
-     (get_local $0)
+     (local.get $0)
      (i32.const 24)
     )
     (i32.const 24)
    )
   )
-  (set_local $z
+  (local.set $z
    (i32.shr_s
     (i32.shl
-     (get_local $1)
+     (local.get $1)
      (i32.const 24)
     )
     (i32.const 24)
    )
   )
   (drop
-   (get_local $z)
+   (local.get $z)
   )
-  (set_local $w
+  (local.set $w
    (i32.shr_s
     (i32.shl
-     (get_local $0)
+     (local.get $0)
      (i32.const 24)
     )
     (i32.const 24)
    )
   )
-  (set_local $w
+  (local.set $w
    (i32.shr_s
     (i32.shl
-     (get_local $0)
+     (local.get $0)
      (i32.const 23)
     )
     (i32.const 24)
@@ -1801,7 +1801,7 @@
   (drop
    (i32.shr_s
     (i32.shl
-     (get_local $w)
+     (local.get $w)
      (i32.const 24)
     )
     (i32.const 24)
@@ -1810,7 +1810,7 @@
   (drop
    (i32.shr_s
     (i32.shl
-     (get_local $0)
+     (local.get $0)
      (i32.const 24)
     )
     (i32.const 23)
@@ -1820,21 +1820,21 @@
  (func $signed-loads-fill-the-bits (; 25 ;) (type $4) (param $$e i32) (result i32)
   (local $$0 i32)
   (local $$conv i32)
-  (set_local $$0
+  (local.set $$0
    (i32.load8_s
     (i32.const 1024)
    )
   )
-  (set_local $$conv
+  (local.set $$conv
    (i32.and
-    (get_local $$0)
+    (local.get $$0)
     (i32.const 255)
    )
   )
   (return
    (i32.eq
-    (get_local $$e)
-    (get_local $$conv)
+    (local.get $$e)
+    (local.get $$conv)
    )
   )
  )
@@ -1843,15 +1843,15 @@
   (local $y i32)
   (local $z i32)
   (local $w i32)
-  (set_local $x
+  (local.set $x
    (i32.load8_s
     (i32.const 1024)
    )
   )
   (drop
-   (get_local $x)
+   (local.get $x)
   )
-  (set_local $y
+  (local.set $y
    (i32.load8_u
     (i32.const 1024)
    )
@@ -1859,13 +1859,13 @@
   (drop
    (i32.shr_s
     (i32.shl
-     (get_local $y)
+     (local.get $y)
      (i32.const 24)
     )
     (i32.const 24)
    )
   )
-  (set_local $z
+  (local.set $z
    (i32.load16_s
     (i32.const 1024)
    )
@@ -1873,7 +1873,7 @@
   (drop
    (i32.shr_s
     (i32.shl
-     (get_local $z)
+     (local.get $z)
      (i32.const 24)
     )
     (i32.const 24)
@@ -1884,10 +1884,10 @@
   (drop
    (i32.eq
     (i32.load8_u
-     (get_local $0)
+     (local.get $0)
     )
     (i32.and
-     (get_local $1)
+     (local.get $1)
      (i32.const 255)
     )
    )
@@ -1895,10 +1895,10 @@
   (drop
    (i32.eq
     (i32.load8_u
-     (get_local $0)
+     (local.get $0)
     )
     (i32.and
-     (get_local $1)
+     (local.get $1)
      (i32.const 255)
     )
    )
@@ -1906,11 +1906,11 @@
   (drop
    (i32.eq
     (i32.load8_u
-     (get_local $0)
+     (local.get $0)
     )
     (i32.shr_s
      (i32.shl
-      (get_local $1)
+      (local.get $1)
       (i32.const 24)
      )
      (i32.const 24)
@@ -1920,11 +1920,11 @@
   (drop
    (i32.eq
     (i32.load8_s
-     (get_local $0)
+     (local.get $0)
     )
     (i32.shr_s
      (i32.shl
-      (get_local $1)
+      (local.get $1)
       (i32.const 16)
      )
      (i32.const 16)
@@ -1934,11 +1934,11 @@
   (drop
    (i32.eq
     (i32.load8_u
-     (get_local $0)
+     (local.get $0)
     )
     (i32.shr_s
      (i32.shl
-      (get_local $1)
+      (local.get $1)
       (i32.const 24)
      )
      (i32.const 24)
@@ -1948,11 +1948,11 @@
   (drop
    (i32.eq
     (i32.load8_s
-     (get_local $0)
+     (local.get $0)
     )
     (i32.shr_s
      (i32.shl
-      (get_local $1)
+      (local.get $1)
       (i32.const 16)
      )
      (i32.const 16)
@@ -2030,7 +2030,7 @@
   (drop
    (i32.eq
     (i32.and
-     (get_local $x)
+     (local.get $x)
      (i32.const 65535)
     )
     (i32.const -2147483648)
@@ -2039,7 +2039,7 @@
   (drop
    (i32.eq
     (i32.and
-     (get_local $x)
+     (local.get $x)
      (i32.const 255)
     )
     (i32.const -2147483648)
@@ -2048,7 +2048,7 @@
   (drop
    (i32.eq
     (i32.and
-     (get_local $x)
+     (local.get $x)
      (i32.const 255)
     )
     (i32.const 127)
@@ -2057,7 +2057,7 @@
   (drop
    (i32.eq
     (i32.and
-     (get_local $x)
+     (local.get $x)
      (i32.const 255)
     )
     (i32.const -2147483648)
@@ -2066,7 +2066,7 @@
   (drop
    (i32.eq
     (i32.and
-     (get_local $x)
+     (local.get $x)
      (i32.const 255)
     )
     (i32.const -2147483648)
@@ -2075,7 +2075,7 @@
   (drop
    (i32.eq
     (i32.and
-     (get_local $x)
+     (local.get $x)
      (i32.const 255)
     )
     (i32.const -2147483648)
@@ -2084,7 +2084,7 @@
   (drop
    (i32.eq
     (i32.and
-     (get_local $x)
+     (local.get $x)
      (i32.const 255)
     )
     (i32.const 252)
@@ -2094,19 +2094,19 @@
  (func $if-parallel (; 32 ;) (type $5) (param $0 i32) (param $1 i32)
   (drop
    (i32.add
-    (get_local $1)
+    (local.get $1)
     (i32.const 1)
    )
   )
   (drop
    (block (result i32)
     (drop
-     (tee_local $0
-      (get_local $1)
+     (local.tee $0
+      (local.get $1)
      )
     )
     (i32.add
-     (get_local $1)
+     (local.get $1)
      (i32.const 1)
     )
    )
@@ -2114,7 +2114,7 @@
   (drop
    (block (result i32)
     (i32.add
-     (get_local $1)
+     (local.get $1)
      (unreachable)
     )
    )
@@ -2122,12 +2122,12 @@
   (drop
    (block (result i32)
     (drop
-     (tee_local $0
-      (get_local $1)
+     (local.tee $0
+      (local.get $1)
      )
     )
     (i32.add
-     (get_local $1)
+     (local.get $1)
      (unreachable)
     )
    )
@@ -2136,11 +2136,11 @@
    (if (result i32)
     (unreachable)
     (i32.add
-     (get_local $1)
+     (local.get $1)
      (unreachable)
     )
     (i32.add
-     (get_local $1)
+     (local.get $1)
      (unreachable)
     )
    )
@@ -2149,54 +2149,54 @@
  (func $select-parallel (; 33 ;) (type $5) (param $0 i32) (param $1 i32)
   (drop
    (i32.add
-    (get_local $1)
+    (local.get $1)
     (i32.const 1)
    )
   )
   (drop
    (select
-    (tee_local $0
-     (get_local $1)
+    (local.tee $0
+     (local.get $1)
     )
-    (tee_local $0
-     (get_local $1)
+    (local.tee $0
+     (local.get $1)
     )
-    (get_local $0)
+    (local.get $0)
    )
   )
   (drop
    (block (result i32)
     (drop
-     (tee_local $0
-      (get_local $1)
+     (local.tee $0
+      (local.get $1)
      )
     )
     (i32.add
-     (get_local $1)
+     (local.get $1)
      (i32.const 1)
     )
    )
   )
   (drop
    (select
-    (tee_local $0
-     (get_local $1)
+    (local.tee $0
+     (local.get $1)
     )
-    (tee_local $0
-     (get_local $1)
+    (local.tee $0
+     (local.get $1)
     )
-    (tee_local $0
-     (get_local $1)
+    (local.tee $0
+     (local.get $1)
     )
    )
   )
   (drop
    (select
-    (tee_local $0
-     (get_local $1)
+    (local.tee $0
+     (local.get $1)
     )
-    (tee_local $0
-     (get_local $1)
+    (local.tee $0
+     (local.get $1)
     )
     (unreachable)
    )
@@ -2263,7 +2263,7 @@
  (func $shifts-square-overflow (; 39 ;) (type $4) (param $x i32) (result i32)
   (i32.shr_u
    (i32.shr_u
-    (get_local $x)
+    (local.get $x)
     (i32.const 65535)
    )
    (i32.const 32767)
@@ -2271,14 +2271,14 @@
  )
  (func $shifts-square-no-overflow-small (; 40 ;) (type $4) (param $x i32) (result i32)
   (i32.shr_u
-   (get_local $x)
+   (local.get $x)
    (i32.const 9)
   )
  )
  (func $shifts-square-overflow-64 (; 41 ;) (type $8) (param $x i64) (result i64)
   (i64.shr_u
    (i64.shr_u
-    (get_local $x)
+    (local.get $x)
     (i64.const 65535)
    )
    (i64.const 64767)
@@ -2286,7 +2286,7 @@
  )
  (func $shifts-square-no-overflow-small-64 (; 42 ;) (type $8) (param $x i64) (result i64)
   (i64.shr_u
-   (get_local $x)
+   (local.get $x)
    (i64.const 9)
   )
  )
@@ -2355,7 +2355,7 @@
   (i32.add
    (i32.shl
     (i32.const -536870912)
-    (i32.wrap/i64
+    (i32.wrap_i64
      (i64.const 0)
     )
    )
@@ -2366,7 +2366,7 @@
   (i32.add
    (i32.shl
     (i32.const -536870912)
-    (i32.wrap/i64
+    (i32.wrap_i64
      (i64.const -1)
     )
    )
@@ -2396,53 +2396,53 @@
   (drop
    (i32.eqz
     (i32.or
-     (get_local $x)
-     (get_local $y)
+     (local.get $x)
+     (local.get $y)
     )
    )
   )
   (drop
    (i32.or
     (i32.eqz
-     (get_local $x)
+     (local.get $x)
     )
     (i32.eqz
-     (get_local $y)
+     (local.get $y)
     )
    )
   )
   (drop
    (i32.xor
     (i32.eqz
-     (get_local $x)
+     (local.get $x)
     )
     (i32.eqz
-     (get_local $y)
+     (local.get $y)
     )
    )
   )
   (drop
    (i32.and
-    (get_local $y)
+    (local.get $y)
     (i32.eqz
-     (get_local $x)
+     (local.get $x)
     )
    )
   )
   (drop
    (i32.and
     (i32.eqz
-     (get_local $y)
+     (local.get $y)
     )
-    (get_local $x)
+    (local.get $x)
    )
   )
   (drop
    (i32.and
     (i32.eqz
-     (get_local $x)
+     (local.get $x)
     )
-    (i32.wrap/i64
+    (i32.wrap_i64
      (i64.const 2)
     )
    )
@@ -2450,9 +2450,9 @@
   (drop
    (i32.and
     (i32.eqz
-     (get_local $y)
+     (local.get $y)
     )
-    (i32.wrap/i64
+    (i32.wrap_i64
      (i64.const 1)
     )
    )
@@ -2462,7 +2462,7 @@
   (i32.sub
    (i32.const 32)
    (i32.clz
-    (get_local $0)
+    (local.get $0)
    )
   )
  )
@@ -2470,23 +2470,23 @@
   (i32.sub
    (i32.const 32)
    (i32.clz
-    (get_local $0)
+    (local.get $0)
    )
   )
  )
  (func $subzero3 (; 58 ;) (type $7) (param $0 i32) (param $1 i32) (result i32)
   (i32.sub
-   (get_local $1)
+   (local.get $1)
    (i32.clz
-    (get_local $0)
+    (local.get $0)
    )
   )
  )
  (func $subzero4 (; 59 ;) (type $7) (param $0 i32) (param $1 i32) (result i32)
   (i32.sub
-   (get_local $0)
+   (local.get $0)
    (i32.clz
-    (get_local $1)
+    (local.get $1)
    )
   )
  )
@@ -2494,7 +2494,7 @@
   (drop
    (call $mul-power-2
     (i32.shl
-     (get_local $x)
+     (local.get $x)
      (i32.const 2)
     )
    )
@@ -2502,14 +2502,14 @@
   (drop
    (call $mul-power-2
     (i32.mul
-     (get_local $x)
+     (local.get $x)
      (i32.const 5)
     )
    )
   )
   (drop
    (call $mul-power-2
-    (get_local $x)
+    (local.get $x)
    )
   )
   (drop
@@ -2530,7 +2530,7 @@
   (drop
    (call $mul-power-2
     (i32.mul
-     (get_local $x)
+     (local.get $x)
      (i32.const -1)
     )
    )
@@ -2538,7 +2538,7 @@
   (drop
    (call $mul-power-2
     (i32.shl
-     (get_local $x)
+     (local.get $x)
      (i32.const 31)
     )
    )
@@ -2549,7 +2549,7 @@
   (drop
    (call $urem-power-2
     (i32.and
-     (get_local $x)
+     (local.get $x)
      (i32.const 3)
     )
    )
@@ -2557,7 +2557,7 @@
   (drop
    (call $urem-power-2
     (i32.rem_u
-     (get_local $x)
+     (local.get $x)
      (i32.const 5)
     )
    )
@@ -2570,7 +2570,7 @@
   (drop
    (call $urem-power-2
     (i32.rem_u
-     (get_local $x)
+     (local.get $x)
      (i32.const 0)
     )
    )
@@ -2578,7 +2578,7 @@
   (drop
    (call $urem-power-2
     (i32.rem_u
-     (get_local $x)
+     (local.get $x)
      (i32.const -1)
     )
    )
@@ -2586,7 +2586,7 @@
   (drop
    (call $urem-power-2
     (i32.and
-     (get_local $x)
+     (local.get $x)
      (i32.const 2147483647)
     )
    )
@@ -2594,7 +2594,7 @@
   (unreachable)
  )
  (func $orZero (; 62 ;) (type $4) (param $0 i32) (result i32)
-  (get_local $0)
+  (local.get $0)
  )
  (func $andZero (; 63 ;) (type $4) (param $0 i32) (result i32)
   (drop
@@ -2612,28 +2612,28 @@
  )
  (func $abstract-additions (; 64 ;) (type $10) (param $x32 i32) (param $x64 i64) (param $y32 f32) (param $y64 f64)
   (drop
-   (get_local $x32)
+   (local.get $x32)
   )
   (drop
-   (get_local $x32)
+   (local.get $x32)
   )
   (drop
-   (get_local $x32)
+   (local.get $x32)
   )
   (drop
-   (get_local $x32)
+   (local.get $x32)
   )
   (drop
-   (get_local $x64)
+   (local.get $x64)
   )
   (drop
-   (get_local $x64)
+   (local.get $x64)
   )
   (drop
-   (get_local $x64)
+   (local.get $x64)
   )
   (drop
-   (get_local $x64)
+   (local.get $x64)
   )
   (drop
    (i32.const 0)
@@ -2643,27 +2643,27 @@
   )
   (drop
    (f32.mul
-    (get_local $y32)
+    (local.get $y32)
     (f32.const 0)
    )
   )
   (drop
    (f64.mul
-    (get_local $y64)
+    (local.get $y64)
     (f64.const 0)
    )
   )
   (drop
-   (get_local $x32)
+   (local.get $x32)
   )
   (drop
-   (get_local $x64)
+   (local.get $x64)
   )
   (drop
-   (get_local $y32)
+   (local.get $y32)
   )
   (drop
-   (get_local $y64)
+   (local.get $y64)
   )
   (drop
    (i32.const 0)
@@ -2684,63 +2684,63 @@
    )
   )
   (drop
-   (get_local $x32)
+   (local.get $x32)
   )
   (drop
-   (get_local $x32)
+   (local.get $x32)
   )
   (drop
-   (get_local $x64)
+   (local.get $x64)
   )
   (drop
-   (get_local $x64)
+   (local.get $x64)
   )
   (drop
-   (get_local $y32)
+   (local.get $y32)
   )
   (drop
-   (get_local $y64)
+   (local.get $y64)
   )
   (drop
    (f32.div
-    (get_local $y32)
+    (local.get $y32)
     (f32.const 1.2000000476837158)
    )
   )
   (drop
    (i32.mul
-    (get_local $x32)
+    (local.get $x32)
     (i32.const -1)
    )
   )
   (drop
    (i64.mul
-    (get_local $x64)
+    (local.get $x64)
     (i64.const -1)
    )
   )
   (drop
    (f32.mul
-    (get_local $y32)
+    (local.get $y32)
     (f32.const -1)
    )
   )
   (drop
    (f64.mul
-    (get_local $y64)
+    (local.get $y64)
     (f64.const -1)
    )
   )
   (drop
    (i32.eq
-    (get_local $x32)
+    (local.get $x32)
     (i32.const 10)
    )
   )
   (drop
    (i32.le_u
     (i32.add
-     (get_local $x32)
+     (local.get $x32)
      (i32.const 10)
     )
     (i32.const 20)
@@ -2748,68 +2748,68 @@
   )
   (drop
    (i32.eq
-    (get_local $x32)
+    (local.get $x32)
     (i32.const 30)
    )
   )
   (drop
    (i64.eq
-    (get_local $x64)
+    (local.get $x64)
     (i64.const 10)
    )
   )
   (drop
    (i32.eq
-    (get_local $x32)
+    (local.get $x32)
     (i32.const 10)
    )
   )
   (drop
    (i32.eq
     (i32.add
-     (get_local $x32)
+     (local.get $x32)
      (i32.const 10)
     )
-    (get_local $x32)
+    (local.get $x32)
    )
   )
   (drop
    (i32.eq
-    (get_local $x32)
+    (local.get $x32)
     (i32.const 30)
    )
   )
   (drop
    (i32.eq
     (i32.sub
-     (get_local $x32)
+     (local.get $x32)
      (i32.const 30)
     )
-    (get_local $x32)
+    (local.get $x32)
    )
   )
   (drop
    (i32.eq
     (i32.sub
-     (get_local $x32)
+     (local.get $x32)
      (i32.const 30)
     )
-    (get_local $x32)
+    (local.get $x32)
    )
   )
   (drop
    (i32.eq
     (i32.sub
-     (get_local $x32)
+     (local.get $x32)
      (i32.const 10)
     )
-    (get_local $x32)
+    (local.get $x32)
    )
   )
   (drop
    (i64.le_s
     (i64.sub
-     (get_local $x64)
+     (local.get $x64)
      (i64.const 288230376151711744)
     )
     (i64.const 9223372036854775807)
@@ -2819,97 +2819,97 @@
  (func $negatives-are-sometimes-better (; 65 ;) (type $11) (param $x i32) (param $y i64) (param $z f32)
   (drop
    (i32.sub
-    (get_local $x)
+    (local.get $x)
     (i32.const -64)
    )
   )
   (drop
    (i32.add
-    (get_local $x)
+    (local.get $x)
     (i32.const -64)
    )
   )
   (drop
    (i32.sub
-    (get_local $x)
+    (local.get $x)
     (i32.const -8192)
    )
   )
   (drop
    (i32.sub
-    (get_local $x)
+    (local.get $x)
     (i32.const -1048576)
    )
   )
   (drop
    (i32.sub
-    (get_local $x)
+    (local.get $x)
     (i32.const -134217728)
    )
   )
   (drop
    (i64.sub
-    (get_local $y)
+    (local.get $y)
     (i64.const -64)
    )
   )
   (drop
    (i64.add
-    (get_local $y)
+    (local.get $y)
     (i64.const -64)
    )
   )
   (drop
    (i64.sub
-    (get_local $y)
+    (local.get $y)
     (i64.const -8192)
    )
   )
   (drop
    (i64.sub
-    (get_local $y)
+    (local.get $y)
     (i64.const -1048576)
    )
   )
   (drop
    (i64.sub
-    (get_local $y)
+    (local.get $y)
     (i64.const -134217728)
    )
   )
   (drop
    (i64.sub
-    (get_local $y)
+    (local.get $y)
     (i64.const -17179869184)
    )
   )
   (drop
    (i64.sub
-    (get_local $y)
+    (local.get $y)
     (i64.const -2199023255552)
    )
   )
   (drop
    (i64.sub
-    (get_local $y)
+    (local.get $y)
     (i64.const -281474976710656)
    )
   )
   (drop
    (i64.sub
-    (get_local $y)
+    (local.get $y)
     (i64.const -36028797018963968)
    )
   )
   (drop
    (i64.sub
-    (get_local $y)
+    (local.get $y)
     (i64.const -4611686018427387904)
    )
   )
   (drop
    (f32.add
-    (get_local $z)
+    (local.get $z)
     (f32.const 64)
    )
   )
@@ -2943,14 +2943,14 @@
   )
   (drop
    (f64.sub
-    (get_local $z)
-    (get_local $z)
+    (local.get $z)
+    (local.get $z)
    )
   )
   (drop
    (i32.sub
-    (get_local $x)
-    (get_local $xx)
+    (local.get $x)
+    (local.get $xx)
    )
   )
   (drop
@@ -2961,8 +2961,8 @@
   )
   (drop
    (i32.add
-    (get_local $x)
-    (get_local $x)
+    (local.get $x)
+    (local.get $x)
    )
   )
   (drop
@@ -2984,10 +2984,10 @@
    (i32.const 0)
   )
   (drop
-   (get_local $x)
+   (local.get $x)
   )
   (drop
-   (get_local $x)
+   (local.get $x)
   )
   (drop
    (i32.const 1)
@@ -3023,10 +3023,10 @@
    (i32.const 0)
   )
   (drop
-   (get_local $y)
+   (local.get $y)
   )
   (drop
-   (get_local $y)
+   (local.get $y)
   )
   (drop
    (i32.const 1)
@@ -3046,21 +3046,21 @@
  )
  (func $all_ones (; 68 ;) (type $0) (param $x i32) (param $y i64)
   (drop
-   (get_local $x)
+   (local.get $x)
   )
   (drop
    (i32.const -1)
   )
   (drop
    (i32.or
-    (tee_local $x
+    (local.tee $x
      (i32.const 1337)
     )
     (i32.const -1)
    )
   )
   (drop
-   (get_local $y)
+   (local.get $y)
   )
   (drop
    (i64.const -1)
@@ -3068,25 +3068,25 @@
  )
  (func $xor (; 69 ;) (type $0) (param $x i32) (param $y i64)
   (drop
-   (get_local $x)
+   (local.get $x)
   )
  )
  (func $select-on-const (; 70 ;) (type $5) (param $x i32) (param $y i32)
   (drop
-   (get_local $x)
+   (local.get $x)
   )
   (drop
    (i32.const 3)
   )
   (drop
-   (tee_local $x
+   (local.tee $x
     (i32.const 5)
    )
   )
   (drop
    (block (result i32)
     (drop
-     (tee_local $x
+     (local.tee $x
       (i32.const 6)
      )
     )
@@ -3096,14 +3096,14 @@
   (drop
    (select
     (i32.const 4)
-    (tee_local $x
+    (local.tee $x
      (i32.const 5)
     )
     (i32.const 1)
    )
   )
   (drop
-   (tee_local $x
+   (local.tee $x
     (i32.const 6)
    )
   )
@@ -3117,29 +3117,29 @@
   (local $x5 i32)
   (local $x6 i32)
   (local $x7 i32)
-  (set_local $x0
+  (local.set $x0
    (i32.const 1)
   )
   (drop
-   (get_local $x0)
+   (local.get $x0)
   )
-  (set_local $x1
-   (tee_local $x2
+  (local.set $x1
+   (local.tee $x2
     (i32.const 1)
    )
   )
   (drop
-   (get_local $x1)
+   (local.get $x1)
   )
-  (set_local $x3
+  (local.set $x3
    (loop $loop-in (result i32)
     (i32.const 1)
    )
   )
   (drop
-   (get_local $x3)
+   (local.get $x3)
   )
-  (set_local $x4
+  (local.set $x4
    (if (result i32)
     (i32.const 1)
     (i32.const 2)
@@ -3148,11 +3148,11 @@
   )
   (drop
    (i32.and
-    (get_local $x4)
+    (local.get $x4)
     (i32.const 7)
    )
   )
-  (set_local $x5
+  (local.set $x5
    (if (result i32)
     (i32.const 1)
     (unreachable)
@@ -3160,9 +3160,9 @@
    )
   )
   (drop
-   (get_local $x5)
+   (local.get $x5)
   )
-  (set_local $x6
+  (local.set $x6
    (if (result i32)
     (i32.const 1)
     (i32.const 3)
@@ -3170,18 +3170,18 @@
    )
   )
   (drop
-   (get_local $x6)
+   (local.get $x6)
   )
   (drop
    (block $out (result i32)
-    (set_local $x7
+    (local.set $x7
      (br_if $out
       (i32.const 1)
       (i32.const 1)
      )
     )
     (drop
-     (get_local $x7)
+     (local.get $x7)
     )
     (unreachable)
    )
@@ -3190,7 +3190,7 @@
  (func $tee-with-unreachable-value (; 72 ;) (type $13) (result f64)
   (local $var$0 i32)
   (block $label$1 (result f64)
-   (tee_local $var$0
+   (local.tee $var$0
     (br_if $label$1
      (f64.const 1)
      (unreachable)
@@ -3203,9 +3203,9 @@
    (i32.add
     (i32.sub
      (i32.const 0)
-     (get_local $temp)
+     (local.get $temp)
     )
-    (tee_local $temp
+    (local.tee $temp
      (i32.const 1)
     )
    )
@@ -3215,10 +3215,10 @@
  (func $add-sub-zero-reorder-2 (; 74 ;) (type $4) (param $temp i32) (result i32)
   (i32.add
    (i32.sub
-    (tee_local $temp
+    (local.tee $temp
      (i32.const 1)
     )
-    (get_local $temp)
+    (local.get $temp)
    )
    (i32.const 2)
   )
@@ -3226,36 +3226,36 @@
  (func $pre-combine-or (; 75 ;) (type $5) (param $x i32) (param $y i32)
   (drop
    (i32.ge_s
-    (get_local $x)
-    (get_local $y)
+    (local.get $x)
+    (local.get $y)
    )
   )
   (drop
    (i32.ge_s
-    (get_local $x)
-    (get_local $y)
+    (local.get $x)
+    (local.get $y)
    )
   )
   (drop
    (i32.or
     (i32.eq
-     (get_local $x)
+     (local.get $x)
      (i32.const 1)
     )
     (i32.gt_s
-     (get_local $x)
-     (get_local $y)
+     (local.get $x)
+     (local.get $y)
     )
    )
   )
   (drop
    (i32.or
     (i32.eq
-     (get_local $x)
-     (get_local $y)
+     (local.get $x)
+     (local.get $y)
     )
     (i32.gt_s
-     (get_local $x)
+     (local.get $x)
      (i32.const 1)
     )
    )
@@ -3264,23 +3264,23 @@
    (i32.or
     (i32.gt_s
      (call $ne0)
-     (get_local $y)
+     (local.get $y)
     )
     (i32.eq
      (call $ne0)
-     (get_local $y)
+     (local.get $y)
     )
    )
   )
   (drop
    (i32.or
     (i32.gt_s
-     (get_local $y)
+     (local.get $y)
      (call $ne0)
     )
     (i32.eq
      (call $ne0)
-     (get_local $y)
+     (local.get $y)
     )
    )
   )
@@ -3288,8 +3288,8 @@
  (func $combine-or (; 76 ;) (type $5) (param $x i32) (param $y i32)
   (drop
    (i32.ge_s
-    (get_local $x)
-    (get_local $y)
+    (local.get $x)
+    (local.get $y)
    )
   )
  )