[wasm] make WebAssembly.Instance require a WebAssembly.Memory

test/mjsunit/wasm/module-memory.js

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Flags: --expose-wasm --expose-gc --stress-compaction
 
 load("test/mjsunit/wasm/wasm-constants.js");
 load("test/mjsunit/wasm/wasm-module-builder.js");
 
 var kMemSize = 65536;
@@ skipping 20 matching lines @@
       /*    */ kExprI32Sub,                // --
       /*    */ kExprSetLocal, 0,           // --
       /*    */ kExprBr, 1,                 // --
       /*    */ kExprEnd,                   // --
       /*  */ kExprEnd,                     // --
       /**/ kExprI8Const, 0                 // --
     ])
     .exportFunc();
   var module = builder.instantiate(null, memory);
   assertTrue(module.exports.memory instanceof WebAssembly.Memory);
-  if (memory != null) assertEquals(memory, module.exports.memory.buffer);
+  if (memory != null) assertEquals(memory.buffer, module.exports.memory.buffer);
   return module;
 }
 
 function testPokeMemory() {
+  print("testPokeMemory");
   var module = genModule(null);
   var buffer = module.exports.memory.buffer;
   var main = module.exports.main;
   assertEquals(kMemSize, buffer.byteLength);
 
   var array = new Int8Array(buffer);
   assertEquals(kMemSize, array.length);
 
   for (var i = 0; i < kMemSize; i++) {
     assertEquals(0, array[i]);
@@ skipping 26 matching lines @@
   }
 }
 
 testSurvivalAcrossGc();
 testSurvivalAcrossGc();
 testSurvivalAcrossGc();
 testSurvivalAcrossGc();
 
 
 function testPokeOuterMemory() {
-  var buffer = new ArrayBuffer(kMemSize);
+  print("testPokeOuterMemory");
+  var buffer = new WebAssembly.Memory({initial: kMemSize / kPageSize});
   var module = genModule(buffer);
   var main = module.exports.main;
-  assertEquals(kMemSize, buffer.byteLength);
+  assertEquals(kMemSize, buffer.buffer.byteLength);
 
-  var array = new Int8Array(buffer);
+  var array = new Int8Array(buffer.buffer);
   assertEquals(kMemSize, array.length);
 
   for (var i = 0; i < kMemSize; i++) {
     assertEquals(0, array[i]);
   }
 
   for (var i = 0; i < 10; i++) {
     assertEquals(0, main(kMemSize - 4));
 
     array[kMemSize/2 + i] = 1;
     assertEquals(0, main(kMemSize/2 - 4));
     assertEquals(-1, main(kMemSize - 4));
 
     array[kMemSize/2 + i] = 0;
     assertEquals(0, main(kMemSize - 4));
   }
 }
 
 testPokeOuterMemory();
 
 function testOuterMemorySurvivalAcrossGc() {
-  var buffer = new ArrayBuffer(kMemSize);
+  var buffer = new WebAssembly.Memory({initial: kMemSize / kPageSize});
   var checker = genAndGetMain(buffer);
   for (var i = 0; i < 3; i++) {
     print("gc run ", i);
     assertEquals(0, checker(kMemSize - 4));
     gc();
   }
 }
 
 testOuterMemorySurvivalAcrossGc();
 testOuterMemorySurvivalAcrossGc();
@@ skipping 28 matching lines @@
   }
 
 
   for (offset = 65534; offset < 66536; offset++) {
     assertTraps(kTrapMemOutOfBounds, read);
     assertTraps(kTrapMemOutOfBounds, write);
   }
 }
 
 testOOBThrows();