Auto-regenerate lld tests and expectations (#4434)

This change was generated by running:

    ./scripts/test/generate_lld_tests.py

and

    ./auto_update_tests.py lld

8 files changed, 134 insertions, 133 deletions

diff --git a/test/lld/em_asm64.wat b/test/lld/em_asm64.wat
index c2e14e3fa..739dab1fc 100644
--- a/test/lld/em_asm64.wat
+++ b/test/lld/em_asm64.wat
@@ -9,8 +9,8 @@
  (data $em_asm (i64.const 574) "{ Module.print(\"Hello world\"); }\00{ return $0 + $1; }\00{ Module.print(\"Got \" + $0); }\00")
  (table $0 1 1 funcref)
  (global $__stack_pointer (mut i64) (i64.const 66208))
- (global $global$1 i32 (i32.const 574))
- (global $global$2 i32 (i32.const 658))
+ (global $global$1 i64 (i64.const 574))
+ (global $global$2 i64 (i64.const 658))
  (export "memory" (memory $0))
  (export "__wasm_call_ctors" (func $__wasm_call_ctors))
  (export "main" (func $main))
@@ -69,5 +69,6 @@
   (call $__original_main)
  )
  ;; custom section "producers", size 112
+ ;; features section: memory64
 )
 
diff --git a/test/lld/em_asm64.wat.out b/test/lld/em_asm64.wat.out
index e1cc005e9..8b0f18174 100644
--- a/test/lld/em_asm64.wat.out
+++ b/test/lld/em_asm64.wat.out
@@ -5,8 +5,8 @@
  (type $i32_i64_=>_i32 (func (param i32 i64) (result i32)))
  (import "env" "emscripten_asm_const_int" (func $emscripten_asm_const_int (param i64 i64 i64) (result i32)))
  (global $__stack_pointer (mut i64) (i64.const 66208))
- (global $global$1 i32 (i32.const 574))
- (global $global$2 i32 (i32.const 658))
+ (global $global$1 i64 (i64.const 574))
+ (global $global$2 i64 (i64.const 658))
  (memory $0 i64 2)
  (data $.rodata (i64.const 568) "\00ii\00i\00")
  (data $em_asm (i64.const 574) "")
diff --git a/test/lld/em_asm_shared.wat b/test/lld/em_asm_shared.wat
index 3f9a5680b..39c23234c 100644
--- a/test/lld/em_asm_shared.wat
+++ b/test/lld/em_asm_shared.wat
@@ -93,11 +93,7 @@
  (func $main (param $0 i32) (param $1 i32) (result i32)
   (call $__original_main)
  )
- ;; dylink section
- ;;   memorysize: 90
- ;;   memoryalignment: 0
- ;;   tablesize: 0
- ;;   tablealignment: 0
+ ;; custom section "dylink.0", size 6
  ;; custom section "producers", size 112
  ;; features section: mutable-globals
 )
diff --git a/test/lld/longjmp.wat b/test/lld/longjmp.wat
index 7bf022f03..f20134c5c 100644
--- a/test/lld/longjmp.wat
+++ b/test/lld/longjmp.wat
@@ -8,38 +8,38 @@
  (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
  (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
  (type $i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32) (result i32)))
- (import "env" "malloc" (func $fimport$0 (param i32) (result i32)))
- (import "env" "saveSetjmp" (func $fimport$1 (param i32 i32 i32 i32) (result i32)))
- (import "env" "getTempRet0" (func $fimport$2 (result i32)))
- (import "env" "emscripten_longjmp" (func $fimport$3 (param i32 i32)))
- (import "env" "invoke_vii" (func $fimport$4 (param i32 i32 i32)))
- (import "env" "testSetjmp" (func $fimport$5 (param i32 i32 i32) (result i32)))
- (import "env" "setTempRet0" (func $fimport$6 (param i32)))
- (import "env" "free" (func $fimport$7 (param i32)))
+ (import "env" "malloc" (func $malloc (param i32) (result i32)))
+ (import "env" "saveSetjmp" (func $saveSetjmp (param i32 i32 i32 i32) (result i32)))
+ (import "env" "getTempRet0" (func $getTempRet0 (result i32)))
+ (import "env" "emscripten_longjmp" (func $emscripten_longjmp (param i32 i32)))
+ (import "env" "invoke_vii" (func $invoke_vii (param i32 i32 i32)))
+ (import "env" "testSetjmp" (func $testSetjmp (param i32 i32 i32) (result i32)))
+ (import "env" "setTempRet0" (func $setTempRet0 (param i32)))
+ (import "env" "free" (func $free (param i32)))
  (memory $0 2)
  (table $0 2 2 funcref)
- (elem (i32.const 1) $fimport$3)
- (global $global$0 (mut i32) (i32.const 66112))
+ (elem (i32.const 1) $emscripten_longjmp)
+ (global $__stack_pointer (mut i32) (i32.const 66112))
  (export "memory" (memory $0))
- (export "__wasm_call_ctors" (func $0))
- (export "main" (func $2))
- (func $0
+ (export "__wasm_call_ctors" (func $__wasm_call_ctors))
+ (export "main" (func $main))
+ (func $__wasm_call_ctors
  )
- (func $1 (result i32)
+ (func $__original_main (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
   (i32.store
    (local.tee $0
-    (call $fimport$0
+    (call $malloc
      (i32.const 40)
     )
    )
    (i32.const 0)
   )
   (local.set $1
-   (call $fimport$1
+   (call $saveSetjmp
     (local.get $0)
     (i32.const 1)
     (local.get $0)
@@ -47,7 +47,7 @@
    )
   )
   (local.set $2
-   (call $fimport$2)
+   (call $getTempRet0)
   )
   (local.set $0
    (i32.const 0)
@@ -62,7 +62,7 @@
       (i32.const 0)
       (i32.const 0)
      )
-     (call $fimport$4
+     (call $invoke_vii
       (i32.const 1)
       (local.get $0)
       (i32.const 1)
@@ -93,7 +93,7 @@
       )
       (br_if $label$1
        (i32.eqz
-        (call $fimport$5
+        (call $testSetjmp
          (i32.load
           (local.get $0)
          )
@@ -102,31 +102,34 @@
         )
        )
       )
-      (call $fimport$6
+      (call $setTempRet0
        (local.get $3)
       )
      )
      (local.set $0
-      (call $fimport$2)
+      (call $getTempRet0)
      )
      (br $label$3)
     )
    )
-   (call $fimport$7
+   (call $free
     (local.get $1)
    )
    (return
     (i32.const 0)
    )
   )
-  (call $fimport$3
+  (call $free
+   (local.get $1)
+  )
+  (call $emscripten_longjmp
    (local.get $0)
    (local.get $3)
   )
   (unreachable)
  )
- (func $2 (param $0 i32) (param $1 i32) (result i32)
-  (call $1)
+ (func $main (param $0 i32) (param $1 i32) (result i32)
+  (call $__original_main)
  )
  ;; custom section "producers", size 112
 )
diff --git a/test/lld/longjmp.wat.out b/test/lld/longjmp.wat.out
index 143a011ad..bef99c9d4 100644
--- a/test/lld/longjmp.wat.out
+++ b/test/lld/longjmp.wat.out
@@ -8,40 +8,40 @@
  (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
  (type $none_=>_none (func))
  (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
- (import "env" "malloc" (func $fimport$0 (param i32) (result i32)))
- (import "env" "saveSetjmp" (func $fimport$1 (param i32 i32 i32 i32) (result i32)))
- (import "env" "getTempRet0" (func $fimport$2 (result i32)))
- (import "env" "emscripten_longjmp" (func $fimport$3 (param i32 i32)))
- (import "env" "invoke_vii" (func $fimport$4 (param i32 i32 i32)))
- (import "env" "testSetjmp" (func $fimport$5 (param i32 i32 i32) (result i32)))
- (import "env" "setTempRet0" (func $fimport$6 (param i32)))
- (import "env" "free" (func $fimport$7 (param i32)))
- (global $global$0 (mut i32) (i32.const 66112))
+ (import "env" "malloc" (func $malloc (param i32) (result i32)))
+ (import "env" "saveSetjmp" (func $saveSetjmp (param i32 i32 i32 i32) (result i32)))
+ (import "env" "getTempRet0" (func $getTempRet0 (result i32)))
+ (import "env" "emscripten_longjmp" (func $emscripten_longjmp (param i32 i32)))
+ (import "env" "invoke_vii" (func $invoke_vii (param i32 i32 i32)))
+ (import "env" "testSetjmp" (func $testSetjmp (param i32 i32 i32) (result i32)))
+ (import "env" "setTempRet0" (func $setTempRet0 (param i32)))
+ (import "env" "free" (func $free (param i32)))
+ (global $__stack_pointer (mut i32) (i32.const 66112))
  (memory $0 2)
  (table $0 2 2 funcref)
- (elem (i32.const 1) $fimport$3)
+ (elem (i32.const 1) $emscripten_longjmp)
  (export "memory" (memory $0))
- (export "__wasm_call_ctors" (func $0))
- (export "main" (func $2))
+ (export "__wasm_call_ctors" (func $__wasm_call_ctors))
+ (export "main" (func $main))
  (export "dynCall_vii" (func $dynCall_vii))
- (func $0
+ (func $__wasm_call_ctors
   (nop)
  )
- (func $1 (result i32)
+ (func $__original_main (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
   (i32.store
    (local.tee $0
-    (call $fimport$0
+    (call $malloc
      (i32.const 40)
     )
    )
    (i32.const 0)
   )
   (local.set $1
-   (call $fimport$1
+   (call $saveSetjmp
     (local.get $0)
     (i32.const 1)
     (local.get $0)
@@ -49,7 +49,7 @@
    )
   )
   (local.set $2
-   (call $fimport$2)
+   (call $getTempRet0)
   )
   (local.set $0
    (i32.const 0)
@@ -64,7 +64,7 @@
       (i32.const 0)
       (i32.const 0)
      )
-     (call $fimport$4
+     (call $invoke_vii
       (i32.const 1)
       (local.get $0)
       (i32.const 1)
@@ -95,7 +95,7 @@
       )
       (br_if $label$1
        (i32.eqz
-        (call $fimport$5
+        (call $testSetjmp
          (i32.load
           (local.get $0)
          )
@@ -104,31 +104,34 @@
         )
        )
       )
-      (call $fimport$6
+      (call $setTempRet0
        (local.get $3)
       )
      )
      (local.set $0
-      (call $fimport$2)
+      (call $getTempRet0)
      )
      (br $label$3)
     )
    )
-   (call $fimport$7
+   (call $free
     (local.get $1)
    )
    (return
     (i32.const 0)
    )
   )
-  (call $fimport$3
+  (call $free
+   (local.get $1)
+  )
+  (call $emscripten_longjmp
    (local.get $0)
    (local.get $3)
   )
   (unreachable)
  )
- (func $2 (param $0 i32) (param $1 i32) (result i32)
-  (call $1)
+ (func $main (param $0 i32) (param $1 i32) (result i32)
+  (call $__original_main)
  )
  (func $dynCall_vii (param $fptr i32) (param $0 i32) (param $1 i32)
   (call_indirect (type $i32_i32_=>_none)
diff --git a/test/lld/shared.wat b/test/lld/shared.wat
index 15700f1f9..5a403aa23 100644
--- a/test/lld/shared.wat
+++ b/test/lld/shared.wat
@@ -49,11 +49,7 @@
    (global.get $external_var)
   )
  )
- ;; dylink section
- ;;   memorysize: 24
- ;;   memoryalignment: 2
- ;;   tablesize: 0
- ;;   tablealignment: 0
+ ;; custom section "dylink.0", size 6
  ;; custom section "producers", size 112
  ;; features section: mutable-globals
 )
diff --git a/test/lld/shared_longjmp.wat b/test/lld/shared_longjmp.wat
index 9da190016..c7d657794 100644
--- a/test/lld/shared_longjmp.wat
+++ b/test/lld/shared_longjmp.wat
@@ -8,47 +8,47 @@
  (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
  (type $i32_i32_i32_i32_=>_i32 (func (param i32 i32 i32 i32) (result i32)))
  (import "env" "memory" (memory $mimport$0 1))
- (data (global.get $gimport$0) "\00\00\00\00\00\00\00\00")
+ (data $.bss (global.get $__memory_base) "\00\00\00\00\00\00\00\00")
  (import "env" "__indirect_function_table" (table $timport$0 0 funcref))
- (import "env" "__memory_base" (global $gimport$0 i32))
- (import "env" "__table_base" (global $gimport$1 i32))
- (import "GOT.mem" "__THREW__" (global $gimport$2 (mut i32)))
- (import "GOT.func" "emscripten_longjmp" (global $gimport$3 (mut i32)))
- (import "GOT.mem" "__threwValue" (global $gimport$4 (mut i32)))
- (import "env" "malloc" (func $fimport$0 (param i32) (result i32)))
- (import "env" "saveSetjmp" (func $fimport$1 (param i32 i32 i32 i32) (result i32)))
- (import "env" "getTempRet0" (func $fimport$2 (result i32)))
- (import "env" "emscripten_longjmp" (func $fimport$3 (param i32 i32)))
- (import "env" "invoke_vii" (func $fimport$4 (param i32 i32 i32)))
- (import "env" "testSetjmp" (func $fimport$5 (param i32 i32 i32) (result i32)))
- (import "env" "setTempRet0" (func $fimport$6 (param i32)))
- (import "env" "free" (func $fimport$7 (param i32)))
+ (import "env" "__memory_base" (global $__memory_base i32))
+ (import "env" "__table_base" (global $__table_base i32))
+ (import "GOT.mem" "__THREW__" (global $__THREW__ (mut i32)))
+ (import "GOT.func" "emscripten_longjmp" (global $emscripten_longjmp (mut i32)))
+ (import "GOT.mem" "__threwValue" (global $__threwValue (mut i32)))
+ (import "env" "malloc" (func $malloc (param i32) (result i32)))
+ (import "env" "saveSetjmp" (func $saveSetjmp (param i32 i32 i32 i32) (result i32)))
+ (import "env" "getTempRet0" (func $getTempRet0 (result i32)))
+ (import "env" "emscripten_longjmp" (func $emscripten_longjmp (param i32 i32)))
+ (import "env" "invoke_vii" (func $invoke_vii (param i32 i32 i32)))
+ (import "env" "testSetjmp" (func $testSetjmp (param i32 i32 i32) (result i32)))
+ (import "env" "setTempRet0" (func $setTempRet0 (param i32)))
+ (import "env" "free" (func $free (param i32)))
  (global $global$0 i32 (i32.const 0))
  (global $global$1 i32 (i32.const 4))
- (export "__wasm_call_ctors" (func $0))
- (export "_start" (func $2))
+ (export "__wasm_call_ctors" (func $__wasm_call_ctors))
+ (export "_start" (func $_start))
  (export "__THREW__" (global $global$0))
  (export "__threwValue" (global $global$1))
- (func $0
-  (call $1)
+ (func $__wasm_call_ctors
+  (call $__wasm_apply_data_relocs)
  )
- (func $1
+ (func $__wasm_apply_data_relocs
  )
- (func $2
+ (func $_start
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
   (i32.store
    (local.tee $0
-    (call $fimport$0
+    (call $malloc
      (i32.const 40)
     )
    )
    (i32.const 0)
   )
   (local.set $1
-   (call $fimport$1
+   (call $saveSetjmp
     (local.get $0)
     (i32.const 1)
     (local.get $0)
@@ -56,7 +56,7 @@
    )
   )
   (local.set $2
-   (call $fimport$2)
+   (call $getTempRet0)
   )
   (local.set $0
    (i32.const 0)
@@ -69,12 +69,12 @@
      )
      (i32.store
       (local.tee $0
-       (global.get $gimport$2)
+       (global.get $__THREW__)
       )
       (i32.const 0)
      )
-     (call $fimport$4
-      (global.get $gimport$3)
+     (call $invoke_vii
+      (global.get $emscripten_longjmp)
       (local.get $0)
       (i32.const 1)
      )
@@ -88,7 +88,7 @@
       (i32.const 0)
      )
      (local.set $0
-      (global.get $gimport$4)
+      (global.get $__threwValue)
      )
      (block $label$4
       (br_if $label$4
@@ -107,7 +107,7 @@
       )
       (br_if $label$1
        (i32.eqz
-        (call $fimport$5
+        (call $testSetjmp
          (i32.load
           (local.get $3)
          )
@@ -116,32 +116,31 @@
         )
        )
       )
-      (call $fimport$6
+      (call $setTempRet0
        (local.get $0)
       )
      )
      (local.set $0
-      (call $fimport$2)
+      (call $getTempRet0)
      )
      (br $label$3)
     )
    )
-   (call $fimport$7
+   (call $free
     (local.get $1)
    )
    (return)
   )
-  (call $fimport$3
+  (call $free
+   (local.get $1)
+  )
+  (call $emscripten_longjmp
    (local.get $3)
    (local.get $0)
   )
   (unreachable)
  )
- ;; dylink section
- ;;   memorysize: 8
- ;;   memoryalignment: 2
- ;;   tablesize: 0
- ;;   tablealignment: 0
+ ;; custom section "dylink.0", size 6
  ;; custom section "producers", size 112
  ;; features section: mutable-globals
 )
diff --git a/test/lld/shared_longjmp.wat.out b/test/lld/shared_longjmp.wat.out
index e1e91ca14..9515c9606 100644
--- a/test/lld/shared_longjmp.wat.out
+++ b/test/lld/shared_longjmp.wat.out
@@ -8,49 +8,49 @@
  (type $none_=>_i32 (func (result i32)))
  (type $i32_i32_i32_=>_i32 (func (param i32 i32 i32) (result i32)))
  (import "env" "memory" (memory $mimport$0 1))
- (data (global.get $gimport$0) "\00\00\00\00\00\00\00\00")
+ (data $.bss (global.get $__memory_base) "\00\00\00\00\00\00\00\00")
  (import "env" "__indirect_function_table" (table $timport$0 0 funcref))
- (import "env" "__memory_base" (global $gimport$0 i32))
- (import "env" "__table_base" (global $gimport$1 i32))
- (import "GOT.mem" "__THREW__" (global $gimport$2 (mut i32)))
- (import "GOT.func" "emscripten_longjmp" (global $gimport$3 (mut i32)))
- (import "GOT.mem" "__threwValue" (global $gimport$4 (mut i32)))
- (import "env" "malloc" (func $fimport$0 (param i32) (result i32)))
- (import "env" "saveSetjmp" (func $fimport$1 (param i32 i32 i32 i32) (result i32)))
- (import "env" "getTempRet0" (func $fimport$2 (result i32)))
- (import "env" "emscripten_longjmp" (func $fimport$3 (param i32 i32)))
- (import "env" "invoke_vii" (func $fimport$4 (param i32 i32 i32)))
- (import "env" "testSetjmp" (func $fimport$5 (param i32 i32 i32) (result i32)))
- (import "env" "setTempRet0" (func $fimport$6 (param i32)))
- (import "env" "free" (func $fimport$7 (param i32)))
+ (import "env" "__memory_base" (global $__memory_base i32))
+ (import "env" "__table_base" (global $__table_base i32))
+ (import "GOT.mem" "__THREW__" (global $__THREW__ (mut i32)))
+ (import "GOT.func" "emscripten_longjmp" (global $emscripten_longjmp (mut i32)))
+ (import "GOT.mem" "__threwValue" (global $__threwValue (mut i32)))
+ (import "env" "malloc" (func $malloc (param i32) (result i32)))
+ (import "env" "saveSetjmp" (func $saveSetjmp (param i32 i32 i32 i32) (result i32)))
+ (import "env" "getTempRet0" (func $getTempRet0 (result i32)))
+ (import "env" "emscripten_longjmp" (func $emscripten_longjmp (param i32 i32)))
+ (import "env" "invoke_vii" (func $invoke_vii (param i32 i32 i32)))
+ (import "env" "testSetjmp" (func $testSetjmp (param i32 i32 i32) (result i32)))
+ (import "env" "setTempRet0" (func $setTempRet0 (param i32)))
+ (import "env" "free" (func $free (param i32)))
  (global $global$0 i32 (i32.const 0))
  (global $global$1 i32 (i32.const 4))
- (export "__wasm_call_ctors" (func $0))
- (export "_start" (func $2))
+ (export "__wasm_call_ctors" (func $__wasm_call_ctors))
+ (export "_start" (func $_start))
  (export "__THREW__" (global $global$0))
  (export "__threwValue" (global $global$1))
  (export "dynCall_vii" (func $dynCall_vii))
- (func $0
-  (call $1)
+ (func $__wasm_call_ctors
+  (call $__wasm_apply_data_relocs)
  )
- (func $1
+ (func $__wasm_apply_data_relocs
   (nop)
  )
- (func $2
+ (func $_start
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
   (i32.store
    (local.tee $0
-    (call $fimport$0
+    (call $malloc
      (i32.const 40)
     )
    )
    (i32.const 0)
   )
   (local.set $1
-   (call $fimport$1
+   (call $saveSetjmp
     (local.get $0)
     (i32.const 1)
     (local.get $0)
@@ -58,7 +58,7 @@
    )
   )
   (local.set $2
-   (call $fimport$2)
+   (call $getTempRet0)
   )
   (local.set $0
    (i32.const 0)
@@ -71,12 +71,12 @@
      )
      (i32.store
       (local.tee $0
-       (global.get $gimport$2)
+       (global.get $__THREW__)
       )
       (i32.const 0)
      )
-     (call $fimport$4
-      (global.get $gimport$3)
+     (call $invoke_vii
+      (global.get $emscripten_longjmp)
       (local.get $0)
       (i32.const 1)
      )
@@ -90,7 +90,7 @@
       (i32.const 0)
      )
      (local.set $0
-      (global.get $gimport$4)
+      (global.get $__threwValue)
      )
      (block $label$4
       (br_if $label$4
@@ -109,7 +109,7 @@
       )
       (br_if $label$1
        (i32.eqz
-        (call $fimport$5
+        (call $testSetjmp
          (i32.load
           (local.get $3)
          )
@@ -118,22 +118,25 @@
         )
        )
       )
-      (call $fimport$6
+      (call $setTempRet0
        (local.get $0)
       )
      )
      (local.set $0
-      (call $fimport$2)
+      (call $getTempRet0)
      )
      (br $label$3)
     )
    )
-   (call $fimport$7
+   (call $free
     (local.get $1)
    )
    (return)
   )
-  (call $fimport$3
+  (call $free
+   (local.get $1)
+  )
+  (call $emscripten_longjmp
    (local.get $3)
    (local.get $0)
   )