Rename tableBase/memoryBase to __table_base/__memory_base (#1731)

1 files changed, 37 insertions, 10 deletions

diff --git a/test/merge/basics.wast.combined.finalized.opt b/test/merge/basics.wast.combined.finalized.opt
index bb7475c45..0b9c21b3b 100644
--- a/test/merge/basics.wast.combined.finalized.opt
+++ b/test/merge/basics.wast.combined.finalized.opt
@@ -2,9 +2,13 @@
  (type $ii (func (param i32 i32)))
  (type $FUNCSIG$v (func))
  (import "env" "memory" (memory $0 256))
- (data (i32.const 1024) "hello, A!\n\00\00\00\00\00\00hello, B!\n")
+ (data (get_global $memoryBase) "hello, A!\n\00\00\00\00\00\00hello, B!\n")
  (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" "memoryBase" (global $memoryBase$0 i32))
+ (import "env" "tableBase" (global $tableBase$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))
@@ -33,8 +37,12 @@
   (drop
    (get_global $global-a-mut)
   )
-  (nop)
-  (nop)
+  (drop
+   (get_global $memoryBase)
+  )
+  (drop
+   (get_global $tableBase)
+  )
   (set_global $global-collide-mut
    (i32.const 1234)
   )
@@ -58,17 +66,36 @@
   (drop
    (get_global $global-b-mut)
   )
-  (nop)
-  (nop)
-  (nop)
-  (nop)
+  (drop
+   (get_global $memoryBase$0)
+  )
+  (drop
+   (get_global $tableBase$0)
+  )
   (drop
    (i32.add
-    (i32.const 14)
+    (get_global $memoryBase$0)
+    (i32.const 1000)
+   )
+  )
+  (drop
+   (i32.add
+    (get_global $tableBase$0)
+    (i32.const 1000)
+   )
+  )
+  (drop
+   (i32.add
+    (get_global $tableBase$0)
     (unreachable)
    )
   )
-  (nop)
+  (drop
+   (i32.sub
+    (get_global $tableBase$0)
+    (i32.const 1000)
+   )
+  )
   (set_global $global-collide-mut$0
    (i32.const 5678)
   )