From cce94378edf437abdf2677f1b94ffdd4bbe36dc6 Mon Sep 17 00:00:00 2001 From: Shu-yu Guo Date: Thu, 20 Jun 2024 17:03:48 -0700 Subject: [PATCH] src: remove ArrayBufferAllocator::Reallocate override (#190) It's being deprecated and removed in V8. PR-URL: https://github.com/nodejs/node/pull/52910 Reviewed-By: Benjamin Gruenbaum Reviewed-By: Anna Henningsen Reviewed-By: James M Snell --- src/api/environment.cc | 33 --------------------------------- src/node_internals.h | 2 -- 2 files changed, 35 deletions(-) diff --git a/src/api/environment.cc b/src/api/environment.cc index d88cd03e95eac3..9eeb7a33970003 100644 --- a/src/api/environment.cc +++ b/src/api/environment.cc @@ -119,14 +119,6 @@ void* NodeArrayBufferAllocator::AllocateUninitialized(size_t size) { return ret; } -void* NodeArrayBufferAllocator::Reallocate( - void* data, size_t old_size, size_t size) { - void* ret = allocator_->Reallocate(data, old_size, size); - if (LIKELY(ret != nullptr) || UNLIKELY(size == 0)) - total_mem_usage_.fetch_add(size - old_size, std::memory_order_relaxed); - return ret; -} - void NodeArrayBufferAllocator::Free(void* data, size_t size) { total_mem_usage_.fetch_sub(size, std::memory_order_relaxed); allocator_->Free(data, size); @@ -156,31 +148,6 @@ void DebuggingArrayBufferAllocator::Free(void* data, size_t size) { NodeArrayBufferAllocator::Free(data, size); } -void* DebuggingArrayBufferAllocator::Reallocate(void* data, - size_t old_size, - size_t size) { - Mutex::ScopedLock lock(mutex_); - void* ret = NodeArrayBufferAllocator::Reallocate(data, old_size, size); - if (ret == nullptr) { - if (size == 0) { // i.e. equivalent to free(). - // suppress coverity warning as data is used as key versus as pointer - // in UnregisterPointerInternal - // coverity[pass_freed_arg] - UnregisterPointerInternal(data, old_size); - } - return nullptr; - } - - if (data != nullptr) { - auto it = allocations_.find(data); - CHECK_NE(it, allocations_.end()); - allocations_.erase(it); - } - - RegisterPointerInternal(ret, size); - return ret; -} - void DebuggingArrayBufferAllocator::RegisterPointer(void* data, size_t size) { Mutex::ScopedLock lock(mutex_); NodeArrayBufferAllocator::RegisterPointer(data, size); diff --git a/src/node_internals.h b/src/node_internals.h index b9ff2c0f8aaa89..27836330834c01 100644 --- a/src/node_internals.h +++ b/src/node_internals.h @@ -123,7 +123,6 @@ class NodeArrayBufferAllocator : public ArrayBufferAllocator { 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; - 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); } @@ -151,7 +150,6 @@ class DebuggingArrayBufferAllocator final : public NodeArrayBufferAllocator { void* Allocate(size_t size) override; void* AllocateUninitialized(size_t size) override; void Free(void* data, size_t size) override; - void* Reallocate(void* data, size_t old_size, size_t size) override; void RegisterPointer(void* data, size_t size) override; void UnregisterPointer(void* data, size_t size) override;