Commit f3d22635 authored by Benedikt Meurer's avatar Benedikt Meurer Committed by Commit Bot

Revert "[wasm] Fix page size constant + test limits on max pages."

This reverts commit 183bc643.

Reason for revert: https://logs.chromium.org/v/?s=chromium%2Fbb%2Fclient.v8%2FV8_Linux_-_debug%2F18780%2F%2B%2Frecipes%2Fsteps%2FCheck_-_extra%2F0%2Flogs%2Fmemory-size%2F0

Original change's description:
> [wasm] Fix page size constant + test limits on max pages.
> 
> BUG=chromium:801604
> R=​bbudge@chromium.org,titzer@chromium.org
> 
> Change-Id: I5fa57d5f8ea288d7aef7d466cbf11df46c4dcd1d
> Reviewed-on: https://chromium-review.googlesource.com/869468
> Reviewed-by: Ben Titzer <titzer@chromium.org>
> Reviewed-by: Bill Budge <bbudge@chromium.org>
> Commit-Queue: Brad Nelson <bradnelson@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#50665}

TBR=bradnelson@chromium.org,bbudge@chromium.org,titzer@chromium.org

Change-Id: I2b5a51f1a94e862f8ac4455d466e23d26c220202
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: chromium:801604
Reviewed-on: https://chromium-review.googlesource.com/872950Reviewed-by: 's avatarBenedikt Meurer <bmeurer@chromium.org>
Commit-Queue: Benedikt Meurer <bmeurer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#50666}
parent 183bc643
......@@ -826,7 +826,7 @@ void WebAssemblyMemoryGrow(const v8::FunctionCallbackInfo<v8::Value>& args) {
return;
}
uint32_t old_size =
old_buffer->byte_length()->Number() / i::wasm::kWasmPageSize;
old_buffer->byte_length()->Number() / i::wasm::kSpecMaxWasmMemoryPages;
int64_t new_size64 = old_size + delta_size;
if (delta_size < 0 || max_size64 < new_size64 || new_size64 < old_size) {
thrower.RangeError(new_size64 < old_size ? "trying to shrink memory"
......
......@@ -7,9 +7,6 @@
load("test/mjsunit/wasm/wasm-constants.js");
load("test/mjsunit/wasm/wasm-module-builder.js");
var kV8MaxWasmMemoryPages = 32767; // ~ 2 GiB
var kSpecMaxWasmMemoryPages = 65536; // 4 GiB
(function testMemorySizeZero() {
print("testMemorySizeZero()");
var builder = new WasmModuleBuilder();
......@@ -32,38 +29,3 @@ var kSpecMaxWasmMemoryPages = 65536; // 4 GiB
var module = builder.instantiate();
assertEquals(size, module.exports.memory_size());
})();
(function testMemorySizeSpecMaxOk() {
print("testMemorySizeV8Max()");
var builder = new WasmModuleBuilder();
builder.addMemory(1, kSpecMaxWasmMemoryPages, true);
builder.addFunction("memory_size", kSig_i_v)
.addBody([kExprMemorySize, kMemoryZero])
.exportFunc();
var module = builder.instantiate();
assertEquals(1, module.exports.memory_size());
})();
(function testMemorySizeV8MaxPlus1Throws() {
print("testMemorySizeV8MaxPlus1Throws()");
var builder = new WasmModuleBuilder();
builder.addMemory(kV8MaxWasmMemoryPages + 1,
kV8MaxWasmMemoryPages + 1, false);
builder.addFunction("memory_size", kSig_i_v)
.addBody([kExprMemorySize, kMemoryZero])
.exportFunc();
assertThrows(() => builder.instantiate());
})();
(function testMemorySpecMaxOk() {
print("testMemoryInitialMaxOk()");
var mem = new WebAssembly.Memory(
{initial: 1, maximum: kSpecMaxWasmMemoryPages});
assertThrows(() => builder.instantiate());
})();
(function testMemoryInitialMaxPlus1Throws() {
print("testMemoryInitialMaxOk()");
assertThrows(() => new WebAssembly.Memory(
{initial: kV8WasmMaxMemoryPages + 1}));
})();
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment