11 files changed, 51 insertions, 51 deletions
diff --git a/test/lld/em_asm_shared.wat.out b/test/lld/em_asm_shared.wat.out
index 8819abed3..bdedaccc1 100644
--- a/test/lld/em_asm_shared.wat.out
+++ b/test/lld/em_asm_shared.wat.out
@@ -95,10 +95,6 @@
  (func $main (param $0 i32) (param $1 i32) (result i32)
   (call $__original_main)
  )
- (func $__post_instantiate
-  (call $__assign_got_enties)
-  (call $__wasm_call_ctors)
- )
  (func $__assign_got_enties
   (global.set $gimport$6
    (call $g$_ZN20__em_asm_sig_builderI19__em_asm_type_tupleIJEEE6bufferE)
@@ -110,6 +106,10 @@
    (call $g$_ZN20__em_asm_sig_builderI19__em_asm_type_tupleIJiEEE6bufferE)
   )
  )
+ (func $__post_instantiate
+  (call $__assign_got_enties)
+  (call $__wasm_call_ctors)
+ )
 )
 (;
 --BEGIN METADATA --
diff --git a/test/lld/gdollar_mainmodule.wat.out b/test/lld/gdollar_mainmodule.wat.out
index cbefc6c47..91ba74b49 100644
--- a/test/lld/gdollar_mainmodule.wat.out
+++ b/test/lld/gdollar_mainmodule.wat.out
@@ -25,11 +25,6 @@
  (func $main (param $0 i32) (param $1 i32) (result i32)
   (i32.const 0)
  )
- (func $__growWasmMemory (param $newSize i32) (result i32)
-  (memory.grow
-   (local.get $newSize)
-  )
- )
  (func $__assign_got_enties
   (global.set $gimport$6
    (call $g$someglobal1)
@@ -44,6 +39,11 @@
    (call $g$someglobal3)
   )
  )
+ (func $__growWasmMemory (param $newSize i32) (result i32)
+  (memory.grow
+   (local.get $newSize)
+  )
+ )
 )
 (;
 --BEGIN METADATA --
diff --git a/test/lld/main_module.wat.out b/test/lld/main_module.wat.out
index 4169c9693..dbfe3510b 100644
--- a/test/lld/main_module.wat.out
+++ b/test/lld/main_module.wat.out
@@ -59,11 +59,6 @@
    (global.get $gimport$5)
   )
  )
- (func $__growWasmMemory (param $newSize i32) (result i32)
-  (memory.grow
-   (local.get $newSize)
-  )
- )
  (func $__assign_got_enties
   (global.set $gimport$5
    (call $g$external_var)
@@ -78,6 +73,11 @@
    )
   )
  )
+ (func $__growWasmMemory (param $newSize i32) (result i32)
+  (memory.grow
+   (local.get $newSize)
+  )
+ )
  (func $dynCall_i (param $fptr i32) (result i32)
   (call_indirect (type $none_=>_i32)
    (local.get $fptr)
diff --git a/test/lld/main_module_table.wat.out b/test/lld/main_module_table.wat.out
index 3f3c7ee10..29fe19f04 100644
--- a/test/lld/main_module_table.wat.out
+++ b/test/lld/main_module_table.wat.out
@@ -17,11 +17,6 @@
  (func $__stdio_write
   (nop)
  )
- (func $__growWasmMemory (param $newSize i32) (result i32)
-  (memory.grow
-   (local.get $newSize)
-  )
- )
  (func $__assign_got_enties
   (global.set $gimport$9
    (i32.add
@@ -30,6 +25,11 @@
    )
   )
  )
+ (func $__growWasmMemory (param $newSize i32) (result i32)
+  (memory.grow
+   (local.get $newSize)
+  )
+ )
  (func $dynCall_v (param $fptr i32)
   (call_indirect (type $none_=>_none)
    (local.get $fptr)
diff --git a/test/lld/main_module_table_2.wat.out b/test/lld/main_module_table_2.wat.out
index af92e7ea2..e08906f28 100644
--- a/test/lld/main_module_table_2.wat.out
+++ b/test/lld/main_module_table_2.wat.out
@@ -17,11 +17,6 @@
  (func $__stdio_write
   (nop)
  )
- (func $__growWasmMemory (param $newSize i32) (result i32)
-  (memory.grow
-   (local.get $newSize)
-  )
- )
  (func $__assign_got_enties
   (global.set $gimport$9
    (i32.add
@@ -30,6 +25,11 @@
    )
   )
  )
+ (func $__growWasmMemory (param $newSize i32) (result i32)
+  (memory.grow
+   (local.get $newSize)
+  )
+ )
  (func $dynCall_v (param $fptr i32)
   (call_indirect (type $none_=>_none)
    (local.get $fptr)
diff --git a/test/lld/main_module_table_3.wat.out b/test/lld/main_module_table_3.wat.out
index 2df18b7b3..0905d9dcf 100644
--- a/test/lld/main_module_table_3.wat.out
+++ b/test/lld/main_module_table_3.wat.out
@@ -17,11 +17,6 @@
  (func $__stdio_write
   (nop)
  )
- (func $__growWasmMemory (param $newSize i32) (result i32)
-  (memory.grow
-   (local.get $newSize)
-  )
- )
  (func $__assign_got_enties
   (global.set $gimport$9
    (i32.add
@@ -30,6 +25,11 @@
    )
   )
  )
+ (func $__growWasmMemory (param $newSize i32) (result i32)
+  (memory.grow
+   (local.get $newSize)
+  )
+ )
  (func $dynCall_v (param $fptr i32)
   (call_indirect (type $none_=>_none)
    (local.get $fptr)
diff --git a/test/lld/main_module_table_4.wat.out b/test/lld/main_module_table_4.wat.out
index 221864563..f2076f4e2 100644
--- a/test/lld/main_module_table_4.wat.out
+++ b/test/lld/main_module_table_4.wat.out
@@ -17,11 +17,6 @@
  (func $__stdio_write
   (nop)
  )
- (func $__growWasmMemory (param $newSize i32) (result i32)
-  (memory.grow
-   (local.get $newSize)
-  )
- )
  (func $__assign_got_enties
   (global.set $gimport$9
    (i32.add
@@ -30,6 +25,11 @@
    )
   )
  )
+ (func $__growWasmMemory (param $newSize i32) (result i32)
+  (memory.grow
+   (local.get $newSize)
+  )
+ )
  (func $dynCall_v (param $fptr i32)
   (call_indirect (type $none_=>_none)
    (local.get $fptr)
diff --git a/test/lld/main_module_table_5.wat.out b/test/lld/main_module_table_5.wat.out
index 32a089127..99f2a5fa1 100644
--- a/test/lld/main_module_table_5.wat.out
+++ b/test/lld/main_module_table_5.wat.out
@@ -23,11 +23,6 @@
  (func $stuff
   (nop)
  )
- (func $__growWasmMemory (param $newSize i32) (result i32)
-  (memory.grow
-   (local.get $newSize)
-  )
- )
  (func $__assign_got_enties
   (global.set $gimport$9
    (i32.add
@@ -36,6 +31,11 @@
    )
   )
  )
+ (func $__growWasmMemory (param $newSize i32) (result i32)
+  (memory.grow
+   (local.get $newSize)
+  )
+ )
  (func $dynCall_v (param $fptr i32)
   (call_indirect (type $none_=>_none)
    (local.get $fptr)
diff --git a/test/lld/shared.wat.out b/test/lld/shared.wat.out
index f83855f3b..ef28d55d4 100644
--- a/test/lld/shared.wat.out
+++ b/test/lld/shared.wat.out
@@ -52,10 +52,6 @@
    (global.get $gimport$5)
   )
  )
- (func $__post_instantiate
-  (call $__assign_got_enties)
-  (call $__wasm_call_ctors)
- )
  (func $__assign_got_enties
   (global.set $gimport$5
    (call $g$external_var)
@@ -67,6 +63,10 @@
    (call $fp$_Z13print_messagev$i)
   )
  )
+ (func $__post_instantiate
+  (call $__assign_got_enties)
+  (call $__wasm_call_ctors)
+ )
 )
 (;
 --BEGIN METADATA --
diff --git a/test/lld/shared_add_to_table.wasm.out b/test/lld/shared_add_to_table.wasm.out
index 26c0fa7af..a3f6cd2cb 100644
--- a/test/lld/shared_add_to_table.wasm.out
+++ b/test/lld/shared_add_to_table.wasm.out
@@ -64,10 +64,6 @@
  (func $main (param $0 i32) (param $1 i32) (result i32)
   (call $__original_main)
  )
- (func $__post_instantiate
-  (call $__assign_got_enties)
-  (call $__wasm_call_ctors)
- )
  (func $__assign_got_enties
   (global.set $gimport$8
    (call $g$waka_mine)
@@ -82,6 +78,10 @@
    (call $fp$_Z14waka_func_minei$ii)
   )
  )
+ (func $__post_instantiate
+  (call $__assign_got_enties)
+  (call $__wasm_call_ctors)
+ )
  ;; dylink section
  ;;   memorysize: 4
  ;;   memoryalignment: 2
diff --git a/test/lld/shared_longjmp.wat.out b/test/lld/shared_longjmp.wat.out
index 4e6589f4a..47b4ea14e 100644
--- a/test/lld/shared_longjmp.wat.out
+++ b/test/lld/shared_longjmp.wat.out
@@ -149,10 +149,6 @@
    (local.get $fptr)
   )
  )
- (func $__post_instantiate
-  (call $__assign_got_enties)
-  (call $0)
- )
  (func $__assign_got_enties
   (global.set $gimport$13
    (call $g$__THREW__)
@@ -164,6 +160,10 @@
    (call $fp$emscripten_longjmp$vii)
   )
  )
+ (func $__post_instantiate
+  (call $__assign_got_enties)
+  (call $0)
+ )
 )
 (;
 --BEGIN METADATA --