Revert of [wasm] Fix bounds check for zero initial memory.

test/mjsunit/wasm/grow-memory.js

 // Copyright 2016 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 kPageSize = 0x10000;
@@ skipping 20 matching lines @@
   builder.addFunction("load8", kSig_i_i)
       .addBody([kExprGetLocal, 0, kExprI32LoadMem8U, 0, 0])
       .exportFunc();
   builder.addFunction("store8", kSig_i_ii)
       .addBody([kExprGetLocal, 0, kExprGetLocal, 1, kExprI32StoreMem8, 0, 0,
                 kExprGetLocal, 1])
       .exportFunc();
   return builder;
 }
 
-// TODO(gdeepti): Generate tests programatically for all the sizes instead of
-// current implementation.
 function testGrowMemoryReadWrite32() {
   var builder = genGrowMemoryBuilder();
   builder.addMemory(1, 1, false);
   var module = builder.instantiate();
   var offset;
   function peek() { return module.exports.load(offset); }
   function poke(value) { return module.exports.store(offset, value); }
   function growMem(pages) { return module.exports.grow_memory(pages); }
 
   for(offset = 0; offset <= (kPageSize - 4); offset+=4) {
@@ skipping 139 matching lines @@
   assertTraps(kTrapMemOutOfBounds, peek);
   assertTraps(kTrapMemOutOfBounds, poke);
 
   assertEquals(0, growMem(1));
 
   for(offset = 0; offset <= kPageSize - 4; offset++) {
     poke(20);
     assertEquals(20, peek());
   }
 
-  for(offset = kPageSize - 3; offset <= kPageSize + 5; offset++) {
-    assertTraps(kTrapMemOutOfBounds, peek);
-  }
-
-  offset = 3*kPageSize;
-  for (var i = 1; i < 4; i++) {
-    assertTraps(kTrapMemOutOfBounds, poke);
-    assertEquals(i, growMem(1));
-  }
-  poke(20);
-  assertEquals(20, peek());
-}
-
-testGrowMemoryZeroInitialSize();
-
-function testGrowMemoryZeroInitialSize32() {
-  var builder = genGrowMemoryBuilder();
-  var module = builder.instantiate();
-  var offset;
-  function peek() { return module.exports.load(offset); }
-  function poke(value) { return module.exports.store(offset, value); }
-  function growMem(pages) { return module.exports.grow_memory(pages); }
-
-  assertTraps(kTrapMemOutOfBounds, peek);
-  assertTraps(kTrapMemOutOfBounds, poke);
-
-  assertEquals(0, growMem(1));
-
-  for(offset = 0; offset <= kPageSize - 4; offset++) {
-    poke(20);
-    assertEquals(20, peek());
-  }
-
-  for(offset = kPageSize - 3; offset <= kPageSize + 5; offset++) {
-    assertTraps(kTrapMemOutOfBounds, peek);
-  }
-}
-
-testGrowMemoryZeroInitialSize32();
-
-function testGrowMemoryZeroInitialSize16() {
-  var builder = genGrowMemoryBuilder();
-  var module = builder.instantiate();
-  var offset;
-  function peek() { return module.exports.load16(offset); }
-  function poke(value) { return module.exports.store16(offset, value); }
-  function growMem(pages) { return module.exports.grow_memory(pages); }
-
-  assertTraps(kTrapMemOutOfBounds, peek);
-  assertTraps(kTrapMemOutOfBounds, poke);
-
-  assertEquals(0, growMem(1));
-
-  for(offset = 0; offset <= kPageSize - 2; offset++) {
-    poke(20);
-    assertEquals(20, peek());
-  }
-
-  for(offset = kPageSize - 1; offset <= kPageSize + 5; offset++) {
-    assertTraps(kTrapMemOutOfBounds, peek);
-  }
-}
-
-testGrowMemoryZeroInitialSize16();
-
-function testGrowMemoryZeroInitialSize8() {
-  var builder = genGrowMemoryBuilder();
-  var module = builder.instantiate();
-  var offset;
-  function peek() { return module.exports.load8(offset); }
-  function poke(value) { return module.exports.store8(offset, value); }
-  function growMem(pages) { return module.exports.grow_memory(pages); }
-
-  assertTraps(kTrapMemOutOfBounds, peek);
-  assertTraps(kTrapMemOutOfBounds, poke);
-
-  assertEquals(0, growMem(1));
-
-  for(offset = 0; offset <= kPageSize - 1; offset++) {
-    poke(20);
-    assertEquals(20, peek());
-  }
-
+  //TODO(gdeepti): Fix tests with correct write boundaries
+  //when runtime function is fixed.
   for(offset = kPageSize; offset <= kPageSize + 5; offset++) {
     assertTraps(kTrapMemOutOfBounds, peek);
   }
 }
 
-testGrowMemoryZeroInitialSize8();
+testGrowMemoryZeroInitialSize();
 
 function testGrowMemoryTrapMaxPagesZeroInitialMemory() {
   var builder = genGrowMemoryBuilder();
   var module = builder.instantiate();
   var maxPages = 16385;
   function growMem(pages) { return module.exports.grow_memory(pages); }
   assertEquals(-1, growMem(maxPages));
 }
 
 testGrowMemoryTrapMaxPagesZeroInitialMemory();
@@ skipping 133 matching lines @@
     poke(0xaced);
     assertEquals(0xaced, peek());
   }
 
   for (offset = 4*kPageSize - 3; offset <= 4*kPageSize + 4; offset++) {
     assertTraps(kTrapMemOutOfBounds, poke);
   }
 }
 
 testGrowMemoryOutOfBoundsOffset();