nodejs
diff --git a/Collapse file
‎lib/async_hooks.js‎
Copy file name to clipboardExpand all lines: lib/async_hooks.js
+15-11Lines changed: 15 additions & 11 deletions b/Collapse file
‎lib/async_hooks.js‎
Copy file name to clipboardExpand all lines: lib/async_hooks.js
+15-11Lines changed: 15 additions & 11 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
+3-5Lines changed: 3 additions & 5 deletions b/Collapse file
‎lib/internal/process/task_queues.js‎
Copy file name to clipboardExpand all lines: lib/internal/process/task_queues.js
+3-5Lines changed: 3 additions & 5 deletions
@@ -134,15 +134,16 @@ class AsyncResource {
   constructor(type, opts = {}) {
     validateString(type, 'type');
 
-    if (typeof opts === 'number') {
-      opts = { triggerAsyncId: opts, requireManualDestroy: false };
-    } else if (opts.triggerAsyncId === undefined) {
-      opts.triggerAsyncId = getDefaultTriggerAsyncId();
+    let triggerAsyncId = opts;
+    let requireManualDestroy = false;
+    if (typeof opts !== 'number') {
+      triggerAsyncId = opts.triggerAsyncId === undefined ?
+        getDefaultTriggerAsyncId() : opts.triggerAsyncId;
+      requireManualDestroy = !!opts.requireManualDestroy;
     }
 
     // Unlike emitInitScript, AsyncResource doesn't supports null as the
     // triggerAsyncId.
-    const triggerAsyncId = opts.triggerAsyncId;
     if (!Number.isSafeInteger(triggerAsyncId) || triggerAsyncId < -1) {
       throw new ERR_INVALID_ASYNC_ID('triggerAsyncId', triggerAsyncId);
     }
@@ -151,15 +152,14 @@ class AsyncResource {
     this[async_id_symbol] = asyncId;
     this[trigger_async_id_symbol] = triggerAsyncId;
 
-    // This prop name (destroyed) has to be synchronized with C++
-    const destroyed = { destroyed: false };
-    this[destroyedSymbol] = destroyed;
-
     if (initHooksExist()) {
       emitInit(asyncId, type, triggerAsyncId, this);
     }
 
-    if (!opts.requireManualDestroy) {
+    if (!requireManualDestroy) {
+      // This prop name (destroyed) has to be synchronized with C++
+      const destroyed = { destroyed: false };
+      this[destroyedSymbol] = destroyed;
       registerDestroyHook(this, asyncId, destroyed);
     }
   }
@@ -168,14 +168,18 @@ class AsyncResource {
     const asyncId = this[async_id_symbol];
     emitBefore(asyncId, this[trigger_async_id_symbol]);
     try {
+      if (thisArg === undefined)
+        return fn(...args);
       return Reflect.apply(fn, thisArg, args);
     } finally {
       emitAfter(asyncId);
     }
   }
 
   emitDestroy() {
-    this[destroyedSymbol].destroyed = true;
+    if (this[destroyedSymbol] !== undefined) {
+      this[destroyedSymbol].destroyed = true;
+    }
     emitDestroy(this[async_id_symbol]);
     return this;
   }
 
@@ -128,15 +128,13 @@ function nextTick(callback) {
 }
 
 let AsyncResource;
+const defaultMicrotaskResourceOpts = { requireManualDestroy: true };
 function createMicrotaskResource() {
   // Lazy load the async_hooks module
-  if (!AsyncResource) {
+  if (AsyncResource === undefined) {
     AsyncResource = require('async_hooks').AsyncResource;
   }
-  return new AsyncResource('Microtask', {
-    triggerAsyncId: getDefaultTriggerAsyncId(),
-    requireManualDestroy: true,
-  });
+  return new AsyncResource('Microtask', defaultMicrotaskResourceOpts);
 }
 
 function runMicrotask() {
Original file line number	Diff line number	Diff line change
`@@ -128,15 +128,13 @@ function nextTick(callback) {`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`let AsyncResource;`
	`131`	`+const defaultMicrotaskResourceOpts = { requireManualDestroy: true };`
`131`	`132`	`function createMicrotaskResource() {`
`132`	`133`	`// Lazy load the async_hooks module`
`133`		`- if (!AsyncResource) {`
	`134`	`+ if (AsyncResource === undefined) {`
`134`	`135`	`AsyncResource = require('async_hooks').AsyncResource;`
`135`	`136`	`}`
`136`		`- return new AsyncResource('Microtask', {`
`137`		`- triggerAsyncId: getDefaultTriggerAsyncId(),`
`138`		`- requireManualDestroy: true,`
`139`		`- });`
	`137`	`+ return new AsyncResource('Microtask', defaultMicrotaskResourceOpts);`
`140`	`138`	`}`
`141`	`139`
`142`	`140`	`function runMicrotask() {`