1 files changed, 16 insertions, 24 deletions
diff --git a/test/merge/basics.wast.combined.finalized b/test/merge/basics.wast.combined.finalized
index d3530fe58..cf4386847 100644
--- a/test/merge/basics.wast.combined.finalized
+++ b/test/merge/basics.wast.combined.finalized
@@ -4,13 +4,17 @@
  (type $ii$0 (func (param i32 i32)))
  (type $FUNCSIG$v$0 (func))
  (import "env" "memory" (memory $0 256))
- (data (i32.const 1024) "hello, A!\n\00\00\00\00\00\00hello, B!\n\00\00\00\00\00\00")
+ (data (get_global $memoryBase) "hello, A!\n\00\00\00\00\00\00hello, B!\n\00\00\00\00\00\00")
  (import "env" "table" (table $0 18 anyfunc))
- (elem (i32.const 8) $only-a $willCollide $some-func $some-collide $only-a $some-func $only-b $willCollide$0 $some-func-b $some-collide$0)
+ (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)
  (import "env" "memoryBase" (global $memoryBase i32))
  (import "env" "tableBase" (global $tableBase i32))
+ (import "env" "__memory_base" (global $__memory_base i32))
+ (import "env" "__table_base" (global $__table_base i32))
  (import "env" "memoryBase" (global $memoryBase$0 i32))
  (import "env" "tableBase" (global $tableBase$0 i32))
+ (import "env" "__memory_base" (global $__memory_base$0 i32))
+ (import "env" "__table_base" (global $__table_base$0 i32))
  (import "env" "some-func" (func $some-func))
  (import "env" "some-collide" (func $some-collide))
  (import "env" "some-func-b" (func $some-func-b))
@@ -50,10 +54,10 @@
    (get_global $global-a-mut)
   )
   (drop
-   (i32.const 1024)
+   (get_global $memoryBase)
   )
   (drop
-   (i32.const 8)
+   (get_global $tableBase)
   )
   (set_global $global-collide-mut
    (i32.const 1234)
@@ -87,44 +91,32 @@
    (get_global $global-b-mut)
   )
   (drop
-   (i32.add
-    (i32.const 1024)
-    (i32.const 16)
-   )
+   (get_global $memoryBase$0)
   )
   (drop
-   (i32.add
-    (i32.const 8)
-    (i32.const 6)
-   )
+   (get_global $tableBase$0)
   )
   (drop
    (i32.add
-    (i32.const 1024)
-    (i32.const 1016)
+    (get_global $memoryBase$0)
+    (i32.const 1000)
    )
   )
   (drop
    (i32.add
-    (i32.const 8)
-    (i32.const 1006)
+    (get_global $tableBase$0)
+    (i32.const 1000)
    )
   )
   (drop
    (i32.add
-    (i32.add
-     (i32.const 8)
-     (i32.const 6)
-    )
+    (get_global $tableBase$0)
     (unreachable)
    )
   )
   (drop
    (i32.sub
-    (i32.add
-     (i32.const 8)
-     (i32.const 6)
-    )
+    (get_global $tableBase$0)
     (i32.const 1000)
    )
   )