nodejs
diff --git a/Collapse file
‎src/env.cc‎
Copy file name to clipboardExpand all lines: src/env.cc
+15Lines changed: 15 additions & 0 deletions b/Collapse file
‎src/env.cc‎
Copy file name to clipboardExpand all lines: src/env.cc
+15Lines changed: 15 additions & 0 deletions
diff --git a/Collapse file
‎src/env.h‎
Copy file name to clipboardExpand all lines: src/env.h
+8Lines changed: 8 additions & 0 deletions b/Collapse file
‎src/env.h‎
Copy file name to clipboardExpand all lines: src/env.h
+8Lines changed: 8 additions & 0 deletions
diff --git a/Collapse file
‎src/sharedarraybuffer_metadata.cc‎
Copy file name to clipboardExpand all lines: src/sharedarraybuffer_metadata.cc
+24Lines changed: 24 additions & 0 deletions b/Collapse file
‎src/sharedarraybuffer_metadata.cc‎
Copy file name to clipboardExpand all lines: src/sharedarraybuffer_metadata.cc
+24Lines changed: 24 additions & 0 deletions
diff --git a/Collapse file
‎src/sharedarraybuffer_metadata.h‎
Copy file name to clipboardExpand all lines: src/sharedarraybuffer_metadata.h
+3Lines changed: 3 additions & 0 deletions b/Collapse file
‎src/sharedarraybuffer_metadata.h‎
Copy file name to clipboardExpand all lines: src/sharedarraybuffer_metadata.h
+3Lines changed: 3 additions & 0 deletions
diff --git a/Collapse file
‎test/parallel/test-worker-sharedarraybuffer-from-worker-thread.js‎
Copy file name to clipboardExpand all lines: test/parallel/test-worker-sharedarraybuffer-from-worker-thread.js
+1Lines changed: 1 addition & 0 deletions b/Collapse file
‎test/parallel/test-worker-sharedarraybuffer-from-worker-thread.js‎
Copy file name to clipboardExpand all lines: test/parallel/test-worker-sharedarraybuffer-from-worker-thread.js
+1Lines changed: 1 addition & 0 deletions
@@ -1036,6 +1036,21 @@ char* Environment::Reallocate(char* data, size_t old_size, size_t size) {
   return new_data;
 }
 
+void Environment::AddArrayBufferAllocatorToKeepAliveUntilIsolateDispose(
+    std::shared_ptr<v8::ArrayBuffer::Allocator> allocator) {
+  if (keep_alive_allocators_ == nullptr) {
+    MultiIsolatePlatform* platform = isolate_data()->platform();
+    CHECK_NOT_NULL(platform);
+
+    keep_alive_allocators_ = new ArrayBufferAllocatorList();
+    platform->AddIsolateFinishedCallback(isolate(), [](void* data) {
+      delete static_cast<ArrayBufferAllocatorList*>(data);
+    }, static_cast<void*>(keep_alive_allocators_));
+  }
+
+  keep_alive_allocators_->insert(allocator);
+}
+
 void AsyncRequest::Install(Environment* env, void* data, uv_async_cb target) {
   CHECK_NULL(async_);
   env_ = env;
 
@@ -1252,6 +1252,10 @@ class Environment : public MemoryRetainer {
 
 #endif  // HAVE_INSPECTOR
 
+  // Only available if a MultiIsolatePlatform is in use.
+  void AddArrayBufferAllocatorToKeepAliveUntilIsolateDispose(
+      std::shared_ptr<v8::ArrayBuffer::Allocator>);
+
  private:
   template <typename Fn>
   inline void CreateImmediate(Fn&& cb,
@@ -1426,6 +1430,10 @@ class Environment : public MemoryRetainer {
   // Used by embedders to shutdown running Node instance.
   AsyncRequest thread_stopper_;
 
+  typedef std::unordered_set<std::shared_ptr<v8::ArrayBuffer::Allocator>>
+      ArrayBufferAllocatorList;
+  ArrayBufferAllocatorList* keep_alive_allocators_ = nullptr;
+
   template <typename T>
   void ForEachBaseObject(T&& iterator);
 
 
@@ -50,6 +50,30 @@ class SABLifetimePartner : public BaseObject {
     : BaseObject(env, obj),
       reference(std::move(r)) {
     MakeWeak();
+    env->AddCleanupHook(CleanupHook, static_cast<void*>(this));
+  }
+
+  ~SABLifetimePartner() {
+    env()->RemoveCleanupHook(CleanupHook, static_cast<void*>(this));
+  }
+
+  static void CleanupHook(void* data) {
+    // There is another cleanup hook attached to this object because it is a
+    // BaseObject. Cleanup hooks are triggered in reverse order of addition,
+    // so if this object is destroyed through GC, the destructor removes all
+    // hooks associated with this object, meaning that this cleanup hook
+    // only runs at the end of the Environment’s lifetime.
+    // In that case, V8 still knows about the SharedArrayBuffer and tries to
+    // free it when the last Isolate with access to it is disposed; for that,
+    // the ArrayBuffer::Allocator needs to be kept alive longer than this
+    // object and longer than the Environment instance.
+    //
+    // This is a workaround for https://github.com/nodejs/node-v8/issues/115
+    // (introduced in V8 7.9) and we should be able to remove it once V8
+    // ArrayBuffer::Allocator refactoring/removal is complete.
+    SABLifetimePartner* self = static_cast<SABLifetimePartner*>(data);
+    self->env()->AddArrayBufferAllocatorToKeepAliveUntilIsolateDispose(
+        self->reference->allocator());
   }
 
   SET_NO_MEMORY_INFO()
 
@@ -37,6 +37,9 @@ class SharedArrayBufferMetadata
   // count is increased by 1.
   v8::MaybeLocal<v8::SharedArrayBuffer> GetSharedArrayBuffer(
       Environment* env, v8::Local<v8::Context> context);
+  std::shared_ptr<v8::ArrayBuffer::Allocator> allocator() const {
+    return allocator_;
+  }
 
   SharedArrayBufferMetadata(SharedArrayBufferMetadata&& other) = delete;
   SharedArrayBufferMetadata& operator=(
 
@@ -1,3 +1,4 @@
+// Flags: --debug-arraybuffer-allocations
 'use strict';
 const common = require('../common');
 const assert = require('assert');
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+// Flags: --debug-arraybuffer-allocations`
`1`	`2`	`'use strict';`
`2`	`3`	`const common = require('../common');`
`3`	`4`	`const assert = require('assert');`