nodejs
diff --git a/Collapse file
‎lib/async_hooks.js‎
Copy file name to clipboardExpand all lines: lib/async_hooks.js
+1-2Lines changed: 1 addition & 2 deletions b/Collapse file
‎lib/async_hooks.js‎
Copy file name to clipboardExpand all lines: lib/async_hooks.js
+1-2Lines changed: 1 addition & 2 deletions
diff --git a/Collapse file
‎lib/internal/async_hooks.js‎
Copy file name to clipboardExpand all lines: lib/internal/async_hooks.js
+2-2Lines changed: 2 additions & 2 deletions b/Collapse file
‎lib/internal/async_hooks.js‎
Copy file name to clipboardExpand all lines: lib/internal/async_hooks.js
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/Collapse file
‎lib/internal/process/task_queues.js‎
Copy file name to clipboardExpand all lines: lib/internal/process/task_queues.js
+2-2Lines changed: 2 additions & 2 deletions b/Collapse file
‎lib/internal/process/task_queues.js‎
Copy file name to clipboardExpand all lines: lib/internal/process/task_queues.js
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/Collapse file
‎src/env.cc‎
Copy file name to clipboardExpand all lines: src/env.cc
+2-3Lines changed: 2 additions & 3 deletions b/Collapse file
‎src/env.cc‎
Copy file name to clipboardExpand all lines: src/env.cc
+2-3Lines changed: 2 additions & 3 deletions
diff --git a/Collapse file
‎test/parallel/test-async-hooks-enabledhooksexits.js‎
Copy file name to clipboard
+18Lines changed: 18 additions & 0 deletions b/Collapse file
‎test/parallel/test-async-hooks-enabledhooksexits.js‎
Copy file name to clipboard
+18Lines changed: 18 additions & 0 deletions
@@ -52,7 +52,6 @@ const {
   emitBefore,
   emitAfter,
   emitDestroy,
-  enabledHooksExist,
   initHooksExist,
   destroyHooksExist,
 } = internal_async_hooks;
@@ -188,7 +187,7 @@ class AsyncResource {
     this[trigger_async_id_symbol] = triggerAsyncId;
 
     if (initHooksExist()) {
-      if (enabledHooksExist() && type.length === 0) {
+      if (type.length === 0) {
         throw new ERR_ASYNC_TYPE(type);
       }
 
 
@@ -481,7 +481,7 @@ function hasHooks(key) {
 }
 
 function enabledHooksExist() {
-  return hasHooks(kCheck);
+  return active_hooks.array.length > 0;
 }
 
 function initHooksExist() {
@@ -563,7 +563,7 @@ function popAsyncContext(asyncId) {
   const stackLength = async_hook_fields[kStackLength];
   if (stackLength === 0) return false;
 
-  if (enabledHooksExist() && async_id_fields[kExecutionAsyncId] !== asyncId) {
+  if (async_hook_fields[kCheck] > 0 && async_id_fields[kExecutionAsyncId] !== asyncId) {
     // Do the same thing as the native code (i.e. crash hard).
     return popAsyncContext_(asyncId);
   }
 
@@ -25,7 +25,7 @@ const {
 
 const {
   getDefaultTriggerAsyncId,
-  getHookArrays,
+  enabledHooksExist,
   newAsyncId,
   initHooksExist,
   emitInit,
@@ -160,7 +160,7 @@ function queueMicrotask(callback) {
   validateFunction(callback, 'callback');
 
   const contextFrame = AsyncContextFrame.current();
-  if (contextFrame || getHookArrays()[0].length > 0) {
+  if (contextFrame || enabledHooksExist()) {
     const asyncResource = new AsyncResource(
       'Microtask',
       defaultMicrotaskResourceOpts,
 
@@ -127,8 +127,7 @@ void AsyncHooks::push_async_context(
     std::variant<Local<Object>*, Global<Object>*> resource) {
   std::visit([](auto* ptr) { CHECK_IMPLIES(ptr != nullptr, !ptr->IsEmpty()); },
              resource);
-  // Since async_hooks is experimental, do only perform the check
-  // when async_hooks is enabled.
+
   if (fields_[kCheck] > 0) {
     CHECK_GE(async_id, -1);
     CHECK_GE(trigger_async_id, -1);
@@ -1748,7 +1747,7 @@ AsyncHooks::AsyncHooks(Isolate* isolate, const SerializeInfo* info)
     clear_async_id_stack();
 
     // Always perform async_hooks checks, not just when async_hooks is enabled.
-    // TODO(AndreasMadsen): Consider removing this for LTS releases.
+    // Can be disabled via CLI option --no-force-async-hooks-checks
     // See discussion in https://github.com/nodejs/node/pull/15454
     // When removing this, do it by reverting the commit. Otherwise the test
     // and flag changes won't be included.
 
@@ -0,0 +1,18 @@
+// Flags: --expose-internals
+'use strict';
+
+require('../common');
+const assert = require('assert');
+const { createHook } = require('async_hooks');
+const { enabledHooksExist } = require('internal/async_hooks');
+
+assert.strictEqual(enabledHooksExist(), false);
+
+const ah = createHook({});
+assert.strictEqual(enabledHooksExist(), false);
+
+ah.enable();
+assert.strictEqual(enabledHooksExist(), true);
+
+ah.disable();
+assert.strictEqual(enabledHooksExist(), false);
Original file line number	Diff line number	Diff line change
`@@ -481,7 +481,7 @@ function hasHooks(key) {`
`481`	`481`	`}`
`482`	`482`
`483`	`483`	`function enabledHooksExist() {`
`484`		`- return hasHooks(kCheck);`
	`484`	`+ return active_hooks.array.length > 0;`
`485`	`485`	`}`
`486`	`486`
`487`	`487`	`function initHooksExist() {`
`@@ -563,7 +563,7 @@ function popAsyncContext(asyncId) {`
`563`	`563`	`const stackLength = async_hook_fields[kStackLength];`
`564`	`564`	`if (stackLength === 0) return false;`
`565`	`565`
`566`		`- if (enabledHooksExist() && async_id_fields[kExecutionAsyncId] !== asyncId) {`
	`566`	`+ if (async_hook_fields[kCheck] > 0 && async_id_fields[kExecutionAsyncId] !== asyncId) {`
`567`	`567`	`// Do the same thing as the native code (i.e. crash hard).`
`568`	`568`	`return popAsyncContext_(asyncId);`
`569`	`569`	`}`