[wasm] Grow memory should return -1 on failure.

test/mjsunit/wasm/grow-memory.js

Index: test/mjsunit/wasm/grow-memory.js
diff --git a/test/mjsunit/wasm/grow-memory.js b/test/mjsunit/wasm/grow-memory.js
index cb90a464825e6c07becb771624422e95d8267192..504aedc2a15f706c5564dd7daaa3ace1b14505e8 100644
--- a/test/mjsunit/wasm/grow-memory.js
+++ b/test/mjsunit/wasm/grow-memory.js
@@ -41,13 +41,7 @@ function testGrowMemoryReadWrite() {
     assertTraps(kTrapMemOutOfBounds, peek);
   }
 
-  try {
-    assertEquals(growMem(3), 1);
-  } catch (e) {
-    assertEquals("object", typeof e);
-    assertEquals(e.message, kTrapMsgs[kTrapMemAllocationFail]);
-    return;
-  }
+  assertTrue(growMem(3) === 1);

[titzer, 2016/08/04 18:20:19]

Use assertEquals(1, growMem(3))

[gdeepti, 2016/08/04 20:10:22]

Fixed here and the ones below. 

 
   for (offset = kPageSize; offset <= 4*kPageSize -4; offset++) {
     poke(20);
@@ -58,13 +52,7 @@ function testGrowMemoryReadWrite() {
     assertTraps(kTrapMemOutOfBounds, peek);
   }
 
-  try {
-    assertEquals(growMem(15), 4);
-  } catch (e) {
-    assertEquals("object", typeof e);
-    assertEquals(e.message, kTrapMsgs[kTrapMemAllocationFail]);
-    return;
-  }
+  assertTrue(growMem(15) === 4);
 
   for (offset = 4*kPageSize - 3; offset <= 4*kPageSize + 4; offset++) {
     poke(20);
@@ -93,13 +81,7 @@ function testGrowMemoryZeroInitialSize() {
   assertTraps(kTrapMemOutOfBounds, peek);
   assertTraps(kTrapMemOutOfBounds, poke);
 
-  try {
-    assertEquals(growMem(1), 0);
-  } catch (e) {
-    assertEquals("object", typeof e);
-    assertEquals(e.message, kTrapMsgs[kTrapMemAllocationFail]);
-    return;
-  }
+  assertTrue(growMem(1) === 0);
 
   for(offset = 0; offset <= kPageSize - 4; offset++) {
     poke(20);
@@ -119,8 +101,8 @@ function testGrowMemoryTrapMaxPagesZeroInitialMemory() {
   var builder = genGrowMemoryBuilder();
   var module = builder.instantiate();
   var maxPages = 16385;
-  function growMem() { return module.exports.grow_memory(maxPages); }
-  assertTraps(kTrapMemOutOfBounds, growMem);
+  function growMem(pages) { return module.exports.grow_memory(pages); }
+  assertEquals(growMem(maxPages), -1);

[titzer, 2016/08/04 18:20:19]

-1, the expected value, should come first here

[gdeepti, 2016/08/04 20:10:22]

Fixed here, and in the rest of the file. 

 }
 
 testGrowMemoryTrapMaxPagesZeroInitialMemory();
@@ -130,8 +112,8 @@ function testGrowMemoryTrapMaxPages() {
   builder.addMemory(1, 1, false);
   var module = builder.instantiate();
   var maxPages = 16384;
-  function growMem() { return module.exports.grow_memory(maxPages); }
-  assertTraps(kTrapMemOutOfBounds, growMem);
+  function growMem(pages) { return module.exports.grow_memory(pages); }
+  assertEquals(growMem(maxPages), -1);
 }
 
 testGrowMemoryTrapMaxPages();