1 files changed, 15 insertions, 15 deletions
diff --git a/test/merge/basics.wast.combined.finalized.opt b/test/merge/basics.wast.combined.finalized.opt
index 0b9c21b3b..057459c84 100644
--- a/test/merge/basics.wast.combined.finalized.opt
+++ b/test/merge/basics.wast.combined.finalized.opt
@@ -2,9 +2,9 @@
  (type $ii (func (param i32 i32)))
  (type $FUNCSIG$v (func))
  (import "env" "memory" (memory $0 256))
- (data (get_global $memoryBase) "hello, A!\n\00\00\00\00\00\00hello, B!\n")
- (import "env" "table" (table $0 18 anyfunc))
- (elem (get_global $tableBase) $only-a $willCollide $some-func $some-collide $only-a $some-func $only-b $willCollide$0 $some-func-b $some-collide$0)
+ (data (global.get $memoryBase) "hello, A!\n\00\00\00\00\00\00hello, B!\n")
+ (import "env" "table" (table $0 18 funcref))
+ (elem (global.get $tableBase) $only-a $willCollide $some-func $some-collide $only-a $some-func $only-b $willCollide$0 $some-func-b $some-collide$0)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
  (import "env" "memoryBase" (global $memoryBase$0 i32))
@@ -35,15 +35,15 @@
   (nop)
   (nop)
   (drop
-   (get_global $global-a-mut)
+   (global.get $global-a-mut)
   )
   (drop
-   (get_global $memoryBase)
+   (global.get $memoryBase)
   )
   (drop
-   (get_global $tableBase)
+   (global.get $tableBase)
   )
-  (set_global $global-collide-mut
+  (global.set $global-collide-mut
    (i32.const 1234)
   )
  )
@@ -64,39 +64,39 @@
   (nop)
   (nop)
   (drop
-   (get_global $global-b-mut)
+   (global.get $global-b-mut)
   )
   (drop
-   (get_global $memoryBase$0)
+   (global.get $memoryBase$0)
   )
   (drop
-   (get_global $tableBase$0)
+   (global.get $tableBase$0)
   )
   (drop
    (i32.add
-    (get_global $memoryBase$0)
+    (global.get $memoryBase$0)
     (i32.const 1000)
    )
   )
   (drop
    (i32.add
-    (get_global $tableBase$0)
+    (global.get $tableBase$0)
     (i32.const 1000)
    )
   )
   (drop
    (i32.add
-    (get_global $tableBase$0)
+    (global.get $tableBase$0)
     (unreachable)
    )
   )
   (drop
    (i32.sub
-    (get_global $tableBase$0)
+    (global.get $tableBase$0)
     (i32.const 1000)
    )
   )
-  (set_global $global-collide-mut$0
+  (global.set $global-collide-mut$0
    (i32.const 5678)
   )
  )