@@ -1,3 +1,17 @@
+2022-01-11  Asumu Takikawa  <asumu@igalia.com>
+
+        [Wasm] Unify memory import handling in module loader and JS cases
+        https://bugs.webkit.org/show_bug.cgi?id=234116
+
+        Reviewed by Yusuke Suzuki.
+
+        Add an instantiation test case that tests that instantiating the same
+        binary module twice will not crash.
+
+        * wasm/js-api/web-assembly-instantiate.js:
+        (assert.asyncTest.async test):
+        (assert.asyncTest):
+
 2022-01-10  Yusuke Suzuki  <ysuzuki@apple.com>
 
         Unreviewed, add a bit more Intl.Locale hourCycle tests to investigate flakiness
 
@@ -190,3 +190,30 @@ assert.eq(WebAssembly.instantiate.length, 1);
 
     assert.asyncTest(test());
 }
+
+{
+    const builder = (new Builder())
+          .Type().End()
+          .Import().Memory("imp", "memory", {initial:100}).End()
+          .Function().End()
+          .Export()
+              .Function("foo")
+          .End()
+          .Code()
+              .Function("foo", { params: [], ret: "i32" })
+                  .I32Const(1)
+              .End()
+          .End();
+
+    const bin = builder.WebAssembly().get();
+
+    async function test() {
+        let module = new WebAssembly.Module(bin);
+        let instance1 = await WebAssembly.instantiate(module, { imp: { memory: new WebAssembly.Memory({ initial: 100 }) } });
+        assert.truthy(instance1 instanceof WebAssembly.Instance);
+        let instance2 = await WebAssembly.instantiate(module, { imp: { memory: new WebAssembly.Memory({ initial: 100 }) } });
+        assert.truthy(instance2 instanceof WebAssembly.Instance);
+    }
+
+    assert.asyncTest(test());
+}
@@ -1,3 +1,20 @@
+2022-01-11  Asumu Takikawa  <asumu@igalia.com>
+
+        [Wasm] Unify memory import handling in module loader and JS cases
+        https://bugs.webkit.org/show_bug.cgi?id=234116
+
+        Reviewed by Yusuke Suzuki.
+
+        Adjust Wasm WPT test expectations now that getter ordering tests
+        should pass.
+
+        * web-platform-tests/wasm/jsapi/constructor/instantiate.any-expected.txt:
+        * web-platform-tests/wasm/jsapi/constructor/instantiate.any.worker-expected.txt:
+        * web-platform-tests/wasm/jsapi/instance/constructor.any-expected.txt:
+        * web-platform-tests/wasm/jsapi/instance/constructor.any.worker-expected.txt:
+        * web-platform-tests/wasm/webapi/instantiateStreaming.any-expected.txt:
+        * web-platform-tests/wasm/webapi/instantiateStreaming.any.worker-expected.txt:
+
 2022-01-11  Antoine Quint  <graouts@webkit.org>
 
         css/css-transitions/KeyframeEffect-setKeyframes.tentative.html is a failure (part 2)
 
@@ -9,8 +9,8 @@ PASS Empty module with undefined imports argument: BufferSource argument
 PASS Empty module with undefined imports argument: Module argument
 PASS Empty module with empty imports argument: BufferSource argument
 PASS Empty module with empty imports argument: Module argument
-FAIL getter order for imports object: BufferSource argument assert_array_equals: expected property 1 to be "global1 getter" but got "memory getter" (expected array ["module getter", "global1 getter", "module2 getter", "global3 getter", "module getter", "memory getter", "module getter", "global2 getter"] got ["module getter", "memory getter", "module getter", "global1 getter", "module2 getter", "global3 getter", "module getter", "global2 getter"])
-FAIL getter order for imports object: Module argument assert_array_equals: expected property 1 to be "global1 getter" but got "memory getter" (expected array ["module getter", "global1 getter", "module2 getter", "global3 getter", "module getter", "memory getter", "module getter", "global2 getter"] got ["module getter", "memory getter", "module getter", "global1 getter", "module2 getter", "global3 getter", "module getter", "global2 getter"])
+PASS getter order for imports object: BufferSource argument
+PASS getter order for imports object: Module argument
 PASS imports: BufferSource argument
 PASS imports: Module argument
 PASS imports with empty module names: BufferSource argument
 
@@ -9,8 +9,8 @@ PASS Empty module with undefined imports argument: BufferSource argument
 PASS Empty module with undefined imports argument: Module argument
 PASS Empty module with empty imports argument: BufferSource argument
 PASS Empty module with empty imports argument: Module argument
-FAIL getter order for imports object: BufferSource argument assert_array_equals: expected property 1 to be "global1 getter" but got "memory getter" (expected array ["module getter", "global1 getter", "module2 getter", "global3 getter", "module getter", "memory getter", "module getter", "global2 getter"] got ["module getter", "memory getter", "module getter", "global1 getter", "module2 getter", "global3 getter", "module getter", "global2 getter"])
-FAIL getter order for imports object: Module argument assert_array_equals: expected property 1 to be "global1 getter" but got "memory getter" (expected array ["module getter", "global1 getter", "module2 getter", "global3 getter", "module getter", "memory getter", "module getter", "global2 getter"] got ["module getter", "memory getter", "module getter", "global1 getter", "module2 getter", "global3 getter", "module getter", "global2 getter"])
+PASS getter order for imports object: BufferSource argument
+PASS getter order for imports object: Module argument
 PASS imports: BufferSource argument
 PASS imports: Module argument
 PASS imports with empty module names: BufferSource argument
 
@@ -7,7 +7,7 @@ PASS Calling
 PASS Empty module without imports argument
 PASS Empty module with undefined imports argument
 PASS Empty module with empty imports argument
-FAIL getter order for imports object assert_array_equals: expected property 1 to be "global1 getter" but got "memory getter" (expected array ["module getter", "global1 getter", "module2 getter", "global3 getter", "module getter", "memory getter", "module getter", "global2 getter"] got ["module getter", "memory getter", "module getter", "global1 getter", "module2 getter", "global3 getter", "module getter", "global2 getter"])
+PASS getter order for imports object
 PASS imports
 PASS imports with empty module names
 PASS imports with empty names
 
@@ -7,7 +7,7 @@ PASS Calling
 PASS Empty module without imports argument
 PASS Empty module with undefined imports argument
 PASS Empty module with empty imports argument
-FAIL getter order for imports object assert_array_equals: expected property 1 to be "global1 getter" but got "memory getter" (expected array ["module getter", "global1 getter", "module2 getter", "global3 getter", "module getter", "memory getter", "module getter", "global2 getter"] got ["module getter", "memory getter", "module getter", "global1 getter", "module2 getter", "global3 getter", "module getter", "global2 getter"])
+PASS getter order for imports object
 PASS imports
 PASS imports with empty module names
 PASS imports with empty names
 
@@ -2,7 +2,7 @@
 PASS Empty module without imports argument
 PASS Empty module with undefined imports argument
 PASS Empty module with empty imports argument
-FAIL getter order for imports object assert_array_equals: expected property 1 to be "global1 getter" but got "memory getter" (expected array ["module getter", "global1 getter", "module2 getter", "global3 getter", "module getter", "memory getter", "module getter", "global2 getter"] got ["module getter", "memory getter", "module getter", "global1 getter", "module2 getter", "global3 getter", "module getter", "global2 getter"])
+PASS getter order for imports object
 PASS imports
 PASS imports with empty module names
 PASS imports with empty names
 
@@ -2,7 +2,7 @@
 PASS Empty module without imports argument
 PASS Empty module with undefined imports argument
 PASS Empty module with empty imports argument
-FAIL getter order for imports object assert_array_equals: expected property 1 to be "global1 getter" but got "memory getter" (expected array ["module getter", "global1 getter", "module2 getter", "global3 getter", "module getter", "memory getter", "module getter", "global2 getter"] got ["module getter", "memory getter", "module getter", "global1 getter", "module2 getter", "global3 getter", "module getter", "global2 getter"])
+PASS getter order for imports object
 PASS imports
 PASS imports with empty module names
 PASS imports with empty names
 
@@ -1,3 +1,22 @@
+2022-01-11  Asumu Takikawa  <asumu@igalia.com>
+
+        [Wasm] Unify memory import handling in module loader and JS cases
+        https://bugs.webkit.org/show_bug.cgi?id=234116
+
+        Reviewed by Yusuke Suzuki.
+
+        Moves the memory import handling code to the Wasm module record and
+        use the strategy used by the module loader to handle memory in all
+        cases.
+
+        * wasm/WasmModule.cpp:
+        (JSC::Wasm::Module::copyInitialCalleeGroupToAllMemoryModes):
+        * wasm/js/JSWebAssemblyInstance.cpp:
+        (JSC::JSWebAssemblyInstance::finalizeCreation):
+        (JSC::JSWebAssemblyInstance::tryCreate):
+        * wasm/js/WebAssemblyModuleRecord.cpp:
+        (JSC::WebAssemblyModuleRecord::initializeImportsAndExports):
+
 2022-01-11  Yusuke Suzuki  <ysuzuki@apple.com>
 
         [JSC] Fix kind of error thrown by wasm module creation