From 37d287f8c3607f187b7592184cb02896c1159947 Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Wed, 27 May 2020 10:22:13 -0700 Subject: [PATCH] Fixup V8 Reallocate patch https://github.com/nodejs/node/pull/31550 --- .../node/override_existing_v8_reallocate.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/patches/node/override_existing_v8_reallocate.patch b/patches/node/override_existing_v8_reallocate.patch index e007e308755f3..5d757b623316f 100644 --- a/patches/node/override_existing_v8_reallocate.patch +++ b/patches/node/override_existing_v8_reallocate.patch @@ -6,18 +6,18 @@ Subject: Override existing V8 Reallocate Refs https://chromium-review.googlesource.com/c/v8/v8/+/2007274. Reallocate has been implemented by V8 itself, so this function must now be overridden. This patch can be removed once the relevant version of V8 -makes its way into Node.js +makes its way into Node.js. diff --git a/src/node_internals.h b/src/node_internals.h -index 0279a4a8274f408049aae5464a7f4559ebe48110..e5d5a6497de3386c7aa70efc1f202f79d9f7567f 100644 +index b627ad3ef42835407a83b721a2f78d4128e48327..efea9db2da008be6a1a470cece9d7a04a628c1a8 100644 --- a/src/node_internals.h +++ b/src/node_internals.h @@ -115,7 +115,7 @@ class NodeArrayBufferAllocator : public ArrayBufferAllocator { - void* AllocateUninitialized(size_t size) override - { return node::UncheckedMalloc(size); } - void Free(void* data, size_t) override { free(data); } -- virtual void* Reallocate(void* data, size_t old_size, size_t size) { -+ virtual void* Reallocate(void* data, size_t old_size, size_t size) override { - return static_cast( - UncheckedRealloc(static_cast(data), size)); + void* Allocate(size_t size) override; // Defined in src/node.cc + void* AllocateUninitialized(size_t size) override; + void Free(void* data, size_t size) override; +- virtual void* Reallocate(void* data, size_t old_size, size_t size); ++ virtual void* Reallocate(void* data, size_t old_size, size_t size) override; + virtual void RegisterPointer(void* data, size_t size) { + total_mem_usage_.fetch_add(size, std::memory_order_relaxed); }