Skip to content

Commit 78ab197

Browse files
danbevBethGriggs
authored andcommitted
deps: cherry-pick 9a49b22 from V8 upstream
Original commit message: Fix alloc/dealloc size mismatch for v8::BackingStore On newer compilers the {operator delete} with explicit {size_t} argument would be instantiated for {v8::BackingStore} and used in the destructor of {std::unique_ptr<v8::BackingStore>}. The {size_t} argument is wrong though, since the pointer actually points to a {v8::internal::BackingStore} object. The solution is to explicitly provide a {operator delete}, preventing an implicitly generated {size_t} operator. Bug:v8:11081 Change-Id: Iee0aa47a67f0e41000bea628942f7e3d70198b83 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2506712 Commit-Queue: Ulan Degenbaev <[email protected]> Reviewed-by: Camillo Bruni <[email protected]> Cr-Commit-Position: refs/heads/master@{#70916} PR-URL: #35939 Fixes: #35669 Refs: v8/v8@9a49b22 Reviewed-By: Jiawen Geng <[email protected]> Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Gus Caplan <[email protected]>
1 parent c6900dd commit 78ab197

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

deps/v8/include/v8.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4975,6 +4975,13 @@ class V8_EXPORT BackingStore : public v8::internal::BackingStoreBase {
49754975
*/
49764976
bool IsShared() const;
49774977

4978+
/**
4979+
* Prevent implicit instantiation of operator delete with size_t argument.
4980+
* The size_t argument would be incorrect because ptr points to the
4981+
* internal BackingStore object.
4982+
*/
4983+
void operator delete(void* ptr) { ::operator delete(ptr); }
4984+
49784985
/**
49794986
* Wrapper around ArrayBuffer::Allocator::Reallocate that preserves IsShared.
49804987
* Assumes that the backing_store was allocated by the ArrayBuffer allocator

0 commit comments

Comments
 (0)