diff --git a/common.gypi b/common.gypi index ec134afcebac..ea723efd0f24 100644 --- a/common.gypi +++ b/common.gypi @@ -50,7 +50,7 @@ # Reset this number to 0 on major V8 upgrades. # Increment by one for each non-official patch applied to deps/v8. - 'v8_embedder_string': '-node.4', + 'v8_embedder_string': '-node.5', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/AUTHORS b/deps/v8/AUTHORS index 4e43ea3d7e14..10f124a54871 100644 --- a/deps/v8/AUTHORS +++ b/deps/v8/AUTHORS @@ -142,6 +142,7 @@ Elisha Hollander Eric Rannaud Erich Ocean Evan Lucas +Fatih Güzel Fedor Indutny Felix Geisendörfer Feng Yu diff --git a/deps/v8/include/v8-array-buffer.h b/deps/v8/include/v8-array-buffer.h index 912098a91a92..d347a02e0fe6 100644 --- a/deps/v8/include/v8-array-buffer.h +++ b/deps/v8/include/v8-array-buffer.h @@ -159,7 +159,7 @@ class V8_EXPORT ArrayBufferBase : public Object { /** * Returns true if this ArrayBuffer may be detached. Always false for - * SharedArrayBuffer. + * immutable ArrayBuffers and SharedArrayBuffers. */ bool IsDetachable() const; diff --git a/deps/v8/src/api/api.cc b/deps/v8/src/api/api.cc index 5dacb03acbfe..a375830687f9 100644 --- a/deps/v8/src/api/api.cc +++ b/deps/v8/src/api/api.cc @@ -9238,6 +9238,7 @@ bool v8::ArrayBufferBase::IsShared() const { } bool v8::ArrayBufferBase::IsDetachable() const { + if (IsImmutable()) return false; return Utils::OpenDirectHandle(this)->is_detachable(); } diff --git a/deps/v8/test/cctest/test-api-array-buffer.cc b/deps/v8/test/cctest/test-api-array-buffer.cc index 8006f72c6474..57a4ecd3447d 100644 --- a/deps/v8/test/cctest/test-api-array-buffer.cc +++ b/deps/v8/test/cctest/test-api-array-buffer.cc @@ -1305,6 +1305,7 @@ TEST(ArrayBuffer_ImmutableBackingStore) { v8::ArrayBuffer::New(isolate, shared_backing_store); CHECK(ab->IsImmutable()); + CHECK(!ab->IsDetachable()); } TEST(ArrayBuffer_CopyArrayBufferBytes) {