lib: remove redundant destroyHook checks

gurgunday · aduh95 · commit f8725861ea0e · 2025-11-07T18:11:13.000+01:00
PR-URL: #60120 Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Gerhard Stöbich <deb2001-github@yahoo.de>
diff --git a/lib/internal/async_hooks.js b/lib/internal/async_hooks.js
@@ -532,7 +532,7 @@ function emitAfterScript(asyncId) {
 
 function emitDestroyScript(asyncId) {
   // Return early if there are no destroy callbacks, or invalid asyncId.
-  if (!hasHooks(kDestroy) || asyncId <= 0)
+  if (!hasHooks(kDestroy) || !(asyncId > 0))
     return;
   async_wrap.queueDestroyAsyncId(asyncId);
 }
diff --git a/lib/internal/process/task_queues.js b/lib/internal/process/task_queues.js
@@ -27,7 +27,6 @@ const {
   getDefaultTriggerAsyncId,
   newAsyncId,
   initHooksExist,
-  destroyHooksExist,
   emitInit,
   emitBefore,
   emitAfter,
@@ -94,8 +93,7 @@ function processTicksAndRejections() {
           }
         }
       } finally {
-        if (destroyHooksExist())
-          emitDestroy(asyncId);
+        emitDestroy(asyncId);
       }
 
       emitAfter(asyncId);
diff --git a/lib/internal/timers.js b/lib/internal/timers.js
@@ -92,7 +92,6 @@ const {
   getDefaultTriggerAsyncId,
   newAsyncId,
   initHooksExist,
-  destroyHooksExist,
   // The needed emit*() functions.
   emitInit,
   emitBefore,
@@ -508,8 +507,7 @@ function getTimerCallbacks(runNextTicks) {
       } finally {
         immediate._onImmediate = null;
 
-        if (destroyHooksExist())
-          emitDestroy(asyncId);
+        emitDestroy(asyncId);
 
         outstandingQueue.head = immediate = immediate._idleNext;
       }
@@ -585,8 +583,7 @@ function getTimerCallbacks(runNextTicks) {
           if (timer[kRefed])
             timeoutInfo[0]--;
 
-          if (destroyHooksExist())
-            emitDestroy(asyncId);
+          emitDestroy(asyncId);
         }
         continue;
       }
@@ -621,8 +618,7 @@ function getTimerCallbacks(runNextTicks) {
           if (timer[kRefed])
             timeoutInfo[0]--;
 
-          if (destroyHooksExist())
-            emitDestroy(asyncId);
+          emitDestroy(asyncId);
         }
       }
 
diff --git a/lib/timers.js b/lib/timers.js
@@ -63,7 +63,6 @@ let timersPromises;
 let timers;
 
 const {
-  destroyHooksExist,
   // The needed emit*() functions.
   emitDestroy,
 } = require('internal/async_hooks');
@@ -78,9 +77,7 @@ function unenroll(item) {
   if (item[kHasPrimitive])
     delete knownTimersById[item[async_id_symbol]];
 
-  // Fewer checks may be possible, but these cover everything.
-  if (destroyHooksExist() && item[async_id_symbol] !== undefined)
-    emitDestroy(item[async_id_symbol]);
+  emitDestroy(item[async_id_symbol]);
 
   L.remove(item);
 
@@ -239,9 +236,7 @@ function clearImmediate(immediate) {
   }
   immediate[kRefed] = null;
 
-  if (destroyHooksExist() && immediate[async_id_symbol] !== undefined) {
-    emitDestroy(immediate[async_id_symbol]);
-  }
+  emitDestroy(immediate[async_id_symbol]);
 
   immediate._onImmediate = null;
 
diff --git a/test/fixtures/errors/async_error_nexttick_main.snapshot b/test/fixtures/errors/async_error_nexttick_main.snapshot
@@ -1,7 +1,7 @@
 Error: test
     at one (*fixtures*async-error.js:4:9)
     at two (*fixtures*async-error.js:17:9)
-    at process.processTicksAndRejections (node:internal*process*task_queues:105:5)
+    at process.processTicksAndRejections (node:internal*process*task_queues:103:5)
     at async three (*fixtures*async-error.js:20:3)
     at async four (*fixtures*async-error.js:24:3)
     at async main (*async_error_nexttick_main.js:7:5)

Original file line number	Diff line number	Diff line change
`@@ -532,7 +532,7 @@ function emitAfterScript(asyncId) {`
`532`	`532`
`533`	`533`	`function emitDestroyScript(asyncId) {`
`534`	`534`	`// Return early if there are no destroy callbacks, or invalid asyncId.`
`535`		`- if (!hasHooks(kDestroy) \|\| asyncId <= 0)`
	`535`	`+ if (!hasHooks(kDestroy) \|\| !(asyncId > 0))`
`536`	`536`	`return;`
`537`	`537`	`async_wrap.queueDestroyAsyncId(asyncId);`
`538`	`538`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@ const {`
`27`	`27`	`getDefaultTriggerAsyncId,`
`28`	`28`	`newAsyncId,`
`29`	`29`	`initHooksExist,`
`30`		`- destroyHooksExist,`
`31`	`30`	`emitInit,`
`32`	`31`	`emitBefore,`
`33`	`32`	`emitAfter,`
`@@ -94,8 +93,7 @@ function processTicksAndRejections() {`
`94`	`93`	`}`
`95`	`94`	`}`
`96`	`95`	`} finally {`
`97`		`- if (destroyHooksExist())`
`98`		`- emitDestroy(asyncId);`
	`96`	`+ emitDestroy(asyncId);`
`99`	`97`	`}`
`100`	`98`
`101`	`99`	`emitAfter(asyncId);`