Skip to content

Commit 7d26bf3

Browse files
anonrigdanielleadams
authored andcommitted
deps: V8: cherry-pick 9df5ef70ff18
Original commit message: Add an `v8::ArrayBuffer::WasDetached` method to the C++ API V8's C++ API does not give a way to tell whether an ArrayBuffer has been detached from the `v8::ArrayBuffer` class. In fact, as far as can be told from the C++ API without running JS code, detached ArrayBuffers behave the same as zero-sized ArrayBuffers and there is no way to observe the difference. However, this difference can be observed in JS because constructing a TypedArray from a detached ArrayBuffer will throw. This change adds a `WasDetached` method to the `v8::ArrayBuffer` class to give embedders access to this information without having to run JS code. Bug: v8:13159 Change-Id: I2bb1e380cee1cecd31f6d48ec3d9f28c03a8a673 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3810345 Commit-Queue: Toon Verwaest <verwaest@chromium.org> Reviewed-by: Toon Verwaest <verwaest@chromium.org> Cr-Commit-Position: refs/heads/main@{#83963} Refs: v8/v8@9df5ef7 PR-URL: #45474 Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Daeyeon Jeong <daeyeon.dev@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 44766c6 commit 7d26bf3

File tree

6 files changed

+46
-1
lines changed

6 files changed

+46
-1
lines changed

common.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
# Reset this number to 0 on major V8 upgrades.
3838
# Increment by one for each non-official patch applied to deps/v8.
39-
'v8_embedder_string': '-node.16',
39+
'v8_embedder_string': '-node.20',
4040

4141
##### V8 defaults for Node.js #####
4242

deps/v8/AUTHORS

+1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ Allan Sandfeld Jensen <allan.jensen@qt.io>
5959
Amos Lim <eui-sang.lim@samsung.com>
6060
Andreas Anyuru <andreas.anyuru@gmail.com>
6161
Andrei Kashcha <anvaka@gmail.com>
62+
Andreu Botella <andreu@andreubotella.com>
6263
Andrew Paprocki <andrew@ishiboo.com>
6364
Anna Henningsen <anna@addaleax.net>
6465
Antoine du Hamel <duhamelantoine1995@gmail.com>

deps/v8/include/v8-array-buffer.h

+8
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,11 @@ class V8_EXPORT ArrayBuffer : public Object {
240240
*/
241241
bool IsDetachable() const;
242242

243+
/**
244+
* Returns true if this ArrayBuffer has been detached.
245+
*/
246+
bool WasDetached() const;
247+
243248
/**
244249
* Detaches this ArrayBuffer and all its views (typed arrays).
245250
* Detaching sets the byte length of the buffer and all typed arrays to zero,
@@ -253,6 +258,9 @@ class V8_EXPORT ArrayBuffer : public Object {
253258
* pointer coordinates the lifetime management of the internal storage
254259
* with any live ArrayBuffers on the heap, even across isolates. The embedder
255260
* should not attempt to manage lifetime of the storage through other means.
261+
*
262+
* The returned shared pointer will not be empty, even if the ArrayBuffer has
263+
* been detached. Use |WasDetached| to tell if it has been detached instead.
256264
*/
257265
std::shared_ptr<BackingStore> GetBackingStore();
258266

deps/v8/src/api/api.cc

+4
Original file line numberDiff line numberDiff line change
@@ -7917,6 +7917,10 @@ bool v8::ArrayBuffer::IsDetachable() const {
79177917
return Utils::OpenHandle(this)->is_detachable();
79187918
}
79197919

7920+
bool v8::ArrayBuffer::WasDetached() const {
7921+
return Utils::OpenHandle(this)->was_detached();
7922+
}
7923+
79207924
namespace {
79217925
std::shared_ptr<i::BackingStore> ToInternal(
79227926
std::shared_ptr<i::BackingStoreBase> backing_store) {

deps/v8/test/cctest/cctest.status

+1
Original file line numberDiff line numberDiff line change
@@ -581,6 +581,7 @@
581581
'test-api/WasmSetJitCodeEventHandler': [SKIP],
582582
'test-api-wasm/WasmStreaming*': [SKIP],
583583
'test-api-wasm/WasmCompileToWasmModuleObject': [SKIP],
584+
'test-api-array-buffer/ArrayBuffer_NonDetachableWasDetached': [SKIP],
584585
'test-backing-store/Run_WasmModule_Buffer_Externalized_Regression_UseAfterFree': [SKIP],
585586
'test-c-wasm-entry/*': [SKIP],
586587
'test-compilation-cache/*': [SKIP],

deps/v8/test/cctest/test-api-array-buffer.cc

+31
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,37 @@ THREADED_TEST(ArrayBuffer_DetachingScript) {
245245
CheckDataViewIsDetached(dv);
246246
}
247247

248+
THREADED_TEST(ArrayBuffer_WasDetached) {
249+
LocalContext env;
250+
v8::Isolate* isolate = env->GetIsolate();
251+
v8::HandleScope handle_scope(isolate);
252+
253+
Local<v8::ArrayBuffer> ab = v8::ArrayBuffer::New(isolate, 0);
254+
CHECK(!ab->WasDetached());
255+
256+
ab->Detach();
257+
CHECK(ab->WasDetached());
258+
}
259+
260+
THREADED_TEST(ArrayBuffer_NonDetachableWasDetached) {
261+
LocalContext env;
262+
v8::Isolate* isolate = env->GetIsolate();
263+
v8::HandleScope handle_scope(isolate);
264+
265+
CompileRun(R"JS(
266+
var wasmMemory = new WebAssembly.Memory({initial: 1, maximum: 2});
267+
)JS");
268+
269+
Local<v8::ArrayBuffer> non_detachable =
270+
CompileRun("wasmMemory.buffer").As<v8::ArrayBuffer>();
271+
CHECK(!non_detachable->IsDetachable());
272+
CHECK(!non_detachable->WasDetached());
273+
274+
CompileRun("wasmMemory.grow(1)");
275+
CHECK(!non_detachable->IsDetachable());
276+
CHECK(non_detachable->WasDetached());
277+
}
278+
248279
THREADED_TEST(ArrayBuffer_ExternalizeEmpty) {
249280
LocalContext env;
250281
v8::Isolate* isolate = env->GetIsolate();

0 commit comments

Comments
 (0)