Skip to content

Commit a4c5136

Browse files
sygCommit Bot
authored andcommitted
Revert "[wasm] Fix incorrect check for growing shared WebAssembly.memory"
This reverts commit 2599d3c. Reason for revert: Test fails with OOM on Arm64 - N5X (https://ci.chromium.org/p/v8/builders/ci/V8%20Android%20Arm64%20-%20N5X/6514) and is racy on predictable builds (https://ci.chromium.org/p/v8/builders/ci/V8%20Linux%20-%20predictable/27044) Original change's description: > [wasm] Fix incorrect check for growing shared WebAssembly.memory > > Bug: chromium:1010272 > Change-Id: Ieff61089255ee088fad45f15a0f1a8f93eeec94b > Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1869077 > Commit-Queue: Deepti Gandluri <[email protected]> > Reviewed-by: Andreas Haas <[email protected]> > Cr-Commit-Position: refs/heads/master@{#64525} [email protected],[email protected],[email protected] Change-Id: I738a4021a80202c9b822815b922de31f95054fe6 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: chromium:1010272 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1879513 Reviewed-by: Shu-yu Guo <[email protected]> Commit-Queue: Shu-yu Guo <[email protected]> Cr-Commit-Position: refs/heads/master@{#64554}
1 parent bdf4292 commit a4c5136

2 files changed

Lines changed: 1 addition & 36 deletions

File tree

src/wasm/wasm-objects.cc

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1031,12 +1031,7 @@ int32_t WasmMemoryObject::Grow(Isolate* isolate,
10311031
new_pages);
10321032
// Broadcasting the update should update this memory object too.
10331033
CHECK_NE(*old_buffer, memory_object->array_buffer());
1034-
// This is a less than check, as it is not guaranteed that the SAB
1035-
// length here will be equal to the stashed length above as calls to
1036-
// grow the same memory object can come in from different workers.
1037-
// It is also possible that a call to Grow was in progress when
1038-
// handling this call.
1039-
CHECK_LE(new_byte_length, memory_object->array_buffer().byte_length());
1034+
CHECK_EQ(new_byte_length, memory_object->array_buffer().byte_length());
10401035
return static_cast<int32_t>(old_pages); // success
10411036
}
10421037
}

test/mjsunit/regress/wasm/regress-1010272.js

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)