9 files changed, 34 insertions, 2 deletions
diff --git a/test/empty_4GB.asm.js b/test/empty_4GB.asm.js
new file mode 100644
index 000000000..94fa6bb38
--- /dev/null
+++ b/test/empty_4GB.asm.js
@@ -0,0 +1,4 @@
+function EmptyModule() {
+    'use asm';
+    return {};
+}
diff --git a/test/empty_4GB.fromasm b/test/empty_4GB.fromasm
new file mode 100644
index 000000000..91ef06fff
--- /dev/null
+++ b/test/empty_4GB.fromasm
@@ -0,0 +1,4 @@
+(module
+ (import "env" "memory" (memory $memory 256 65536))
+ (data (i32.const 1024) "empty_4GB.asm.js")
+)
diff --git a/test/empty_4GB.fromasm.clamp b/test/empty_4GB.fromasm.clamp
new file mode 100644
index 000000000..91ef06fff
--- /dev/null
+++ b/test/empty_4GB.fromasm.clamp
@@ -0,0 +1,4 @@
+(module
+ (import "env" "memory" (memory $memory 256 65536))
+ (data (i32.const 1024) "empty_4GB.asm.js")
+)
diff --git a/test/empty_4GB.fromasm.clamp.no-opts b/test/empty_4GB.fromasm.clamp.no-opts
new file mode 100644
index 000000000..7f68f6564
--- /dev/null
+++ b/test/empty_4GB.fromasm.clamp.no-opts
@@ -0,0 +1,6 @@
+(module
+ (import "env" "memory" (memory $memory 256 65536))
+ (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "memoryBase" (global $memoryBase i32))
+ (import "env" "tableBase" (global $tableBase i32))
+)
diff --git a/test/empty_4GB.fromasm.imprecise b/test/empty_4GB.fromasm.imprecise
new file mode 100644
index 000000000..4427f36e0
--- /dev/null
+++ b/test/empty_4GB.fromasm.imprecise
@@ -0,0 +1,2 @@
+(module
+)
diff --git a/test/empty_4GB.fromasm.imprecise.no-opts b/test/empty_4GB.fromasm.imprecise.no-opts
new file mode 100644
index 000000000..7f68f6564
--- /dev/null
+++ b/test/empty_4GB.fromasm.imprecise.no-opts
@@ -0,0 +1,6 @@
+(module
+ (import "env" "memory" (memory $memory 256 65536))
+ (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "memoryBase" (global $memoryBase i32))
+ (import "env" "tableBase" (global $tableBase i32))
+)
diff --git a/test/empty_4GB.fromasm.no-opts b/test/empty_4GB.fromasm.no-opts
new file mode 100644
index 000000000..7f68f6564
--- /dev/null
+++ b/test/empty_4GB.fromasm.no-opts
@@ -0,0 +1,6 @@
+(module
+ (import "env" "memory" (memory $memory 256 65536))
+ (import "env" "table" (table 0 0 anyfunc))
+ (import "env" "memoryBase" (global $memoryBase i32))
+ (import "env" "tableBase" (global $tableBase i32))
+)
diff --git a/test/wasm2js/grow-memory-tricky.2asm.js b/test/wasm2js/grow-memory-tricky.2asm.js
index 3d5b9ec76..6d5aae8f1 100644
--- a/test/wasm2js/grow-memory-tricky.2asm.js
+++ b/test/wasm2js/grow-memory-tricky.2asm.js
@@ -45,7 +45,7 @@ function asmFunc(global, env, buffer) {
   pagesToAdd = pagesToAdd | 0;
   var oldPages = __wasm_current_memory() | 0;
   var newPages = oldPages + pagesToAdd | 0;
-  if ((oldPages < newPages) && (newPages < 65535)) {
+  if ((oldPages < newPages) && (newPages < 65536)) {
    var newBuffer = new ArrayBuffer(Math_imul(newPages, 65536));
    var newHEAP8 = new global.Int8Array(newBuffer);
    newHEAP8.set(HEAP8);
diff --git a/test/wasm2js/grow_memory.2asm.js b/test/wasm2js/grow_memory.2asm.js
index db41919d2..31e3dd525 100644
--- a/test/wasm2js/grow_memory.2asm.js
+++ b/test/wasm2js/grow_memory.2asm.js
@@ -34,7 +34,7 @@ function asmFunc(global, env, buffer) {
   pagesToAdd = pagesToAdd | 0;
   var oldPages = __wasm_current_memory() | 0;
   var newPages = oldPages + pagesToAdd | 0;
-  if ((oldPages < newPages) && (newPages < 65535)) {
+  if ((oldPages < newPages) && (newPages < 65536)) {
    var newBuffer = new ArrayBuffer(Math_imul(newPages, 65536));
    var newHEAP8 = new global.Int8Array(newBuffer);
    newHEAP8.set(HEAP8);