From a93ca2d494d6165c25daae687882fa008a956419 Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Fri, 23 Oct 2020 13:36:54 -0400 Subject: [PATCH] n-api: revert change to finalization MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: https://github.com/nodejs/node/issues/35620 This reverts commit a6b655614f03e073b9c60f3d71ed884c5af32ffc which changed finalization behavior related to N-API. We will investigate the original issue with the test separately. PR-URL: https://github.com/nodejs/node/pull/35777 Reviewed-By: Gireesh Punathil Reviewed-By: Rich Trott Reviewed-By: Juan José Arboleda Reviewed-By: Chengzhong Wu Reviewed-By: Gerhard Stöbich --- src/js_native_api_v8.cc | 6 ++---- test/node-api/test_worker_terminate_finalization/test.js | 6 ++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/js_native_api_v8.cc b/src/js_native_api_v8.cc index 5e3cee9ea0596f..6a205fafcaa95f 100644 --- a/src/js_native_api_v8.cc +++ b/src/js_native_api_v8.cc @@ -228,10 +228,9 @@ class RefBase : protected Finalizer, RefTracker { // from one of Unwrap or napi_delete_reference. // // When it is called from Unwrap or napi_delete_reference we only - // want to do the delete if there is no finalizer or the finalizer has already - // run or cannot have been queued to run (i.e. the reference count is > 0), + // want to do the delete if the finalizer has already run or + // cannot have been queued to run (ie the reference count is > 0), // otherwise we may crash when the finalizer does run. - // // If the finalizer may have been queued and has not already run // delay the delete until the finalizer runs by not doing the delete // and setting _delete_self to true so that the finalizer will @@ -243,7 +242,6 @@ class RefBase : protected Finalizer, RefTracker { static inline void Delete(RefBase* reference) { reference->Unlink(); if ((reference->RefCount() != 0) || - (reference->_finalize_callback == nullptr) || (reference->_delete_self) || (reference->_finalize_ran)) { delete reference; diff --git a/test/node-api/test_worker_terminate_finalization/test.js b/test/node-api/test_worker_terminate_finalization/test.js index 7240520080e66c..171a32b812334f 100644 --- a/test/node-api/test_worker_terminate_finalization/test.js +++ b/test/node-api/test_worker_terminate_finalization/test.js @@ -1,6 +1,12 @@ 'use strict'; const common = require('../../common'); +// TODO(addaleax): Run this test once it stops failing under ASAN/valgrind. +// Refs: https://github.com/nodejs/node/issues/34731 +// Refs: https://github.com/nodejs/node/pull/35777 +// Refs: https://github.com/nodejs/node/issues/35778 +common.skip('Reference management in N-API leaks memory'); + const { Worker, isMainThread } = require('worker_threads'); if (isMainThread) {