From 0ef50acb762120f3a548cd1fd59813427770f9e9 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Fri, 14 Jun 2024 10:09:37 -0500
Subject: [PATCH] Update spec testsuite submodule (#1618)

---
 tests/snapshots/testsuite/memory.wast.json    | 165 ++++++++++++++++++
 .../snapshots/testsuite/memory.wast/79.print  |  16 ++
 .../function-references/return_call.wast.json |  13 +-
 .../return_call_indirect.wast.json            |  15 +-
 .../return_call_ref.wast.json                 |   7 +
 .../proposals/memory64/memory.wast.json       | 165 ++++++++++++++++++
 .../proposals/memory64/memory.wast/79.print   |  16 ++
 .../proposals/multi-memory/memory.wast.json   | 165 ++++++++++++++++++
 .../multi-memory/memory.wast/77.print         |  16 ++
 tests/testsuite                               |   2 +-
 10 files changed, 572 insertions(+), 8 deletions(-)
 create mode 100644 tests/snapshots/testsuite/memory.wast/79.print
 create mode 100644 tests/snapshots/testsuite/proposals/memory64/memory.wast/79.print
 create mode 100644 tests/snapshots/testsuite/proposals/multi-memory/memory.wast/77.print

diff --git a/tests/snapshots/testsuite/memory.wast.json b/tests/snapshots/testsuite/memory.wast.json
index 0f7dfa794e..7830dd2c13 100644
--- a/tests/snapshots/testsuite/memory.wast.json
+++ b/tests/snapshots/testsuite/memory.wast.json
@@ -1093,6 +1093,171 @@
       "filename": "memory.33.wat",
       "text": "duplicate memory",
       "module_type": "text"
+    },
+    {
+      "type": "module",
+      "line": 246,
+      "filename": "memory.34.wasm"
+    },
+    {
+      "type": "assert_return",
+      "line": 260,
+      "action": {
+        "type": "invoke",
+        "field": "load",
+        "args": [
+          {
+            "type": "i32",
+            "value": "0"
+          }
+        ]
+      },
+      "expected": [
+        {
+          "type": "i32",
+          "value": "0"
+        }
+      ]
+    },
+    {
+      "type": "assert_return",
+      "line": 261,
+      "action": {
+        "type": "invoke",
+        "field": "load",
+        "args": [
+          {
+            "type": "i32",
+            "value": "10000"
+          }
+        ]
+      },
+      "expected": [
+        {
+          "type": "i32",
+          "value": "0"
+        }
+      ]
+    },
+    {
+      "type": "assert_return",
+      "line": 262,
+      "action": {
+        "type": "invoke",
+        "field": "load",
+        "args": [
+          {
+            "type": "i32",
+            "value": "20000"
+          }
+        ]
+      },
+      "expected": [
+        {
+          "type": "i32",
+          "value": "0"
+        }
+      ]
+    },
+    {
+      "type": "assert_return",
+      "line": 263,
+      "action": {
+        "type": "invoke",
+        "field": "load",
+        "args": [
+          {
+            "type": "i32",
+            "value": "30000"
+          }
+        ]
+      },
+      "expected": [
+        {
+          "type": "i32",
+          "value": "0"
+        }
+      ]
+    },
+    {
+      "type": "assert_return",
+      "line": 264,
+      "action": {
+        "type": "invoke",
+        "field": "load",
+        "args": [
+          {
+            "type": "i32",
+            "value": "40000"
+          }
+        ]
+      },
+      "expected": [
+        {
+          "type": "i32",
+          "value": "0"
+        }
+      ]
+    },
+    {
+      "type": "assert_return",
+      "line": 265,
+      "action": {
+        "type": "invoke",
+        "field": "load",
+        "args": [
+          {
+            "type": "i32",
+            "value": "50000"
+          }
+        ]
+      },
+      "expected": [
+        {
+          "type": "i32",
+          "value": "0"
+        }
+      ]
+    },
+    {
+      "type": "assert_return",
+      "line": 266,
+      "action": {
+        "type": "invoke",
+        "field": "load",
+        "args": [
+          {
+            "type": "i32",
+            "value": "60000"
+          }
+        ]
+      },
+      "expected": [
+        {
+          "type": "i32",
+          "value": "0"
+        }
+      ]
+    },
+    {
+      "type": "assert_return",
+      "line": 267,
+      "action": {
+        "type": "invoke",
+        "field": "load",
+        "args": [
+          {
+            "type": "i32",
+            "value": "65535"
+          }
+        ]
+      },
+      "expected": [
+        {
+          "type": "i32",
+          "value": "0"
+        }
+      ]
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/snapshots/testsuite/memory.wast/79.print b/tests/snapshots/testsuite/memory.wast/79.print
new file mode 100644
index 0000000000..20f91d9cb6
--- /dev/null
+++ b/tests/snapshots/testsuite/memory.wast/79.print
@@ -0,0 +1,16 @@
+(module
+  (type (;0;) (func (param i32) (result i32)))
+  (func (;0;) (type 0) (param i32) (result i32)
+    local.get 0
+    i32.load8_u
+  )
+  (memory (;0;) 1 1)
+  (global (;0;) i32 i32.const 10000)
+  (global (;1;) i32 i32.const 10000)
+  (global (;2;) i32 i32.const 10000)
+  (export "memory" (memory 0))
+  (export "__data_end" (global 0))
+  (export "__stack_top" (global 1))
+  (export "__heap_base" (global 2))
+  (export "load" (func 0))
+)
diff --git a/tests/snapshots/testsuite/proposals/function-references/return_call.wast.json b/tests/snapshots/testsuite/proposals/function-references/return_call.wast.json
index 47e987d263..5400ea4be4 100644
--- a/tests/snapshots/testsuite/proposals/function-references/return_call.wast.json
+++ b/tests/snapshots/testsuite/proposals/function-references/return_call.wast.json
@@ -650,17 +650,24 @@
     },
     {
       "type": "assert_invalid",
-      "line": 196,
+      "line": 192,
       "filename": "return_call.11.wasm",
-      "text": "unknown function",
+      "text": "type mismatch",
       "module_type": "binary"
     },
     {
       "type": "assert_invalid",
-      "line": 200,
+      "line": 204,
       "filename": "return_call.12.wasm",
       "text": "unknown function",
       "module_type": "binary"
+    },
+    {
+      "type": "assert_invalid",
+      "line": 208,
+      "filename": "return_call.13.wasm",
+      "text": "unknown function",
+      "module_type": "binary"
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/snapshots/testsuite/proposals/function-references/return_call_indirect.wast.json b/tests/snapshots/testsuite/proposals/function-references/return_call_indirect.wast.json
index d516ab63ea..48bf185b9f 100644
--- a/tests/snapshots/testsuite/proposals/function-references/return_call_indirect.wast.json
+++ b/tests/snapshots/testsuite/proposals/function-references/return_call_indirect.wast.json
@@ -1048,22 +1048,29 @@
     },
     {
       "type": "assert_invalid",
-      "line": 516,
+      "line": 512,
       "filename": "return_call_indirect.25.wasm",
-      "text": "unknown type",
+      "text": "type mismatch",
       "module_type": "binary"
     },
     {
       "type": "assert_invalid",
-      "line": 523,
+      "line": 526,
       "filename": "return_call_indirect.26.wasm",
       "text": "unknown type",
       "module_type": "binary"
     },
     {
       "type": "assert_invalid",
-      "line": 534,
+      "line": 533,
       "filename": "return_call_indirect.27.wasm",
+      "text": "unknown type",
+      "module_type": "binary"
+    },
+    {
+      "type": "assert_invalid",
+      "line": 544,
+      "filename": "return_call_indirect.28.wasm",
       "text": "unknown function 0",
       "module_type": "binary"
     }
diff --git a/tests/snapshots/testsuite/proposals/function-references/return_call_ref.wast.json b/tests/snapshots/testsuite/proposals/function-references/return_call_ref.wast.json
index 86ed2d9daa..de34636302 100644
--- a/tests/snapshots/testsuite/proposals/function-references/return_call_ref.wast.json
+++ b/tests/snapshots/testsuite/proposals/function-references/return_call_ref.wast.json
@@ -704,6 +704,13 @@
       "filename": "return_call_ref.13.wasm",
       "text": "type mismatch",
       "module_type": "binary"
+    },
+    {
+      "type": "assert_invalid",
+      "line": 379,
+      "filename": "return_call_ref.14.wasm",
+      "text": "type mismatch",
+      "module_type": "binary"
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/snapshots/testsuite/proposals/memory64/memory.wast.json b/tests/snapshots/testsuite/proposals/memory64/memory.wast.json
index dc581c1e51..aeb90ccc27 100644
--- a/tests/snapshots/testsuite/proposals/memory64/memory.wast.json
+++ b/tests/snapshots/testsuite/proposals/memory64/memory.wast.json
@@ -1093,6 +1093,171 @@
       "filename": "memory.33.wat",
       "text": "duplicate memory",
       "module_type": "text"
+    },
+    {
+      "type": "module",
+      "line": 246,
+      "filename": "memory.34.wasm"
+    },
+    {
+      "type": "assert_return",
+      "line": 260,
+      "action": {
+        "type": "invoke",
+        "field": "load",
+        "args": [
+          {
+            "type": "i32",
+            "value": "0"
+          }
+        ]
+      },
+      "expected": [
+        {
+          "type": "i32",
+          "value": "0"
+        }
+      ]
+    },
+    {
+      "type": "assert_return",
+      "line": 261,
+      "action": {
+        "type": "invoke",
+        "field": "load",
+        "args": [
+          {
+            "type": "i32",
+            "value": "10000"
+          }
+        ]
+      },
+      "expected": [
+        {
+          "type": "i32",
+          "value": "0"
+        }
+      ]
+    },
+    {
+      "type": "assert_return",
+      "line": 262,
+      "action": {
+        "type": "invoke",
+        "field": "load",
+        "args": [
+          {
+            "type": "i32",
+            "value": "20000"
+          }
+        ]
+      },
+      "expected": [
+        {
+          "type": "i32",
+          "value": "0"
+        }
+      ]
+    },
+    {
+      "type": "assert_return",
+      "line": 263,
+      "action": {
+        "type": "invoke",
+        "field": "load",
+        "args": [
+          {
+            "type": "i32",
+            "value": "30000"
+          }
+        ]
+      },
+      "expected": [
+        {
+          "type": "i32",
+          "value": "0"
+        }
+      ]
+    },
+    {
+      "type": "assert_return",
+      "line": 264,
+      "action": {
+        "type": "invoke",
+        "field": "load",
+        "args": [
+          {
+            "type": "i32",
+            "value": "40000"
+          }
+        ]
+      },
+      "expected": [
+        {
+          "type": "i32",
+          "value": "0"
+        }
+      ]
+    },
+    {
+      "type": "assert_return",
+      "line": 265,
+      "action": {
+        "type": "invoke",
+        "field": "load",
+        "args": [
+          {
+            "type": "i32",
+            "value": "50000"
+          }
+        ]
+      },
+      "expected": [
+        {
+          "type": "i32",
+          "value": "0"
+        }
+      ]
+    },
+    {
+      "type": "assert_return",
+      "line": 266,
+      "action": {
+        "type": "invoke",
+        "field": "load",
+        "args": [
+          {
+            "type": "i32",
+            "value": "60000"
+          }
+        ]
+      },
+      "expected": [
+        {
+          "type": "i32",
+          "value": "0"
+        }
+      ]
+    },
+    {
+      "type": "assert_return",
+      "line": 267,
+      "action": {
+        "type": "invoke",
+        "field": "load",
+        "args": [
+          {
+            "type": "i32",
+            "value": "65535"
+          }
+        ]
+      },
+      "expected": [
+        {
+          "type": "i32",
+          "value": "0"
+        }
+      ]
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/snapshots/testsuite/proposals/memory64/memory.wast/79.print b/tests/snapshots/testsuite/proposals/memory64/memory.wast/79.print
new file mode 100644
index 0000000000..20f91d9cb6
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/memory64/memory.wast/79.print
@@ -0,0 +1,16 @@
+(module
+  (type (;0;) (func (param i32) (result i32)))
+  (func (;0;) (type 0) (param i32) (result i32)
+    local.get 0
+    i32.load8_u
+  )
+  (memory (;0;) 1 1)
+  (global (;0;) i32 i32.const 10000)
+  (global (;1;) i32 i32.const 10000)
+  (global (;2;) i32 i32.const 10000)
+  (export "memory" (memory 0))
+  (export "__data_end" (global 0))
+  (export "__stack_top" (global 1))
+  (export "__heap_base" (global 2))
+  (export "load" (func 0))
+)
diff --git a/tests/snapshots/testsuite/proposals/multi-memory/memory.wast.json b/tests/snapshots/testsuite/proposals/multi-memory/memory.wast.json
index e8516de459..51af008038 100644
--- a/tests/snapshots/testsuite/proposals/multi-memory/memory.wast.json
+++ b/tests/snapshots/testsuite/proposals/multi-memory/memory.wast.json
@@ -1079,6 +1079,171 @@
       "filename": "memory.31.wat",
       "text": "duplicate memory",
       "module_type": "text"
+    },
+    {
+      "type": "module",
+      "line": 243,
+      "filename": "memory.32.wasm"
+    },
+    {
+      "type": "assert_return",
+      "line": 257,
+      "action": {
+        "type": "invoke",
+        "field": "load",
+        "args": [
+          {
+            "type": "i32",
+            "value": "0"
+          }
+        ]
+      },
+      "expected": [
+        {
+          "type": "i32",
+          "value": "0"
+        }
+      ]
+    },
+    {
+      "type": "assert_return",
+      "line": 258,
+      "action": {
+        "type": "invoke",
+        "field": "load",
+        "args": [
+          {
+            "type": "i32",
+            "value": "10000"
+          }
+        ]
+      },
+      "expected": [
+        {
+          "type": "i32",
+          "value": "0"
+        }
+      ]
+    },
+    {
+      "type": "assert_return",
+      "line": 259,
+      "action": {
+        "type": "invoke",
+        "field": "load",
+        "args": [
+          {
+            "type": "i32",
+            "value": "20000"
+          }
+        ]
+      },
+      "expected": [
+        {
+          "type": "i32",
+          "value": "0"
+        }
+      ]
+    },
+    {
+      "type": "assert_return",
+      "line": 260,
+      "action": {
+        "type": "invoke",
+        "field": "load",
+        "args": [
+          {
+            "type": "i32",
+            "value": "30000"
+          }
+        ]
+      },
+      "expected": [
+        {
+          "type": "i32",
+          "value": "0"
+        }
+      ]
+    },
+    {
+      "type": "assert_return",
+      "line": 261,
+      "action": {
+        "type": "invoke",
+        "field": "load",
+        "args": [
+          {
+            "type": "i32",
+            "value": "40000"
+          }
+        ]
+      },
+      "expected": [
+        {
+          "type": "i32",
+          "value": "0"
+        }
+      ]
+    },
+    {
+      "type": "assert_return",
+      "line": 262,
+      "action": {
+        "type": "invoke",
+        "field": "load",
+        "args": [
+          {
+            "type": "i32",
+            "value": "50000"
+          }
+        ]
+      },
+      "expected": [
+        {
+          "type": "i32",
+          "value": "0"
+        }
+      ]
+    },
+    {
+      "type": "assert_return",
+      "line": 263,
+      "action": {
+        "type": "invoke",
+        "field": "load",
+        "args": [
+          {
+            "type": "i32",
+            "value": "60000"
+          }
+        ]
+      },
+      "expected": [
+        {
+          "type": "i32",
+          "value": "0"
+        }
+      ]
+    },
+    {
+      "type": "assert_return",
+      "line": 264,
+      "action": {
+        "type": "invoke",
+        "field": "load",
+        "args": [
+          {
+            "type": "i32",
+            "value": "65535"
+          }
+        ]
+      },
+      "expected": [
+        {
+          "type": "i32",
+          "value": "0"
+        }
+      ]
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/snapshots/testsuite/proposals/multi-memory/memory.wast/77.print b/tests/snapshots/testsuite/proposals/multi-memory/memory.wast/77.print
new file mode 100644
index 0000000000..20f91d9cb6
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/multi-memory/memory.wast/77.print
@@ -0,0 +1,16 @@
+(module
+  (type (;0;) (func (param i32) (result i32)))
+  (func (;0;) (type 0) (param i32) (result i32)
+    local.get 0
+    i32.load8_u
+  )
+  (memory (;0;) 1 1)
+  (global (;0;) i32 i32.const 10000)
+  (global (;1;) i32 i32.const 10000)
+  (global (;2;) i32 i32.const 10000)
+  (export "memory" (memory 0))
+  (export "__data_end" (global 0))
+  (export "__stack_top" (global 1))
+  (export "__heap_base" (global 2))
+  (export "load" (func 0))
+)
diff --git a/tests/testsuite b/tests/testsuite
index 6dfedc8b84..e05365077e 160000
--- a/tests/testsuite
+++ b/tests/testsuite
@@ -1 +1 @@
-Subproject commit 6dfedc8b8423a91c1dc340d3af1a7f4fbf7868b4
+Subproject commit e05365077e13a1d86ffe77acfb1a835b7aa78422