nodejs
diff --git a/‎lib/timers.js‎
Lines changed: 1 addition & 1 deletion b/‎lib/timers.js‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎lib/timers/promises.js‎
Lines changed: 2 additions & 8 deletions b/‎lib/timers/promises.js‎
Lines changed: 2 additions & 8 deletions
@@ -171,7 +171,7 @@ ObjectDefineProperty(setTimeout, customPromisify, {
 });
 
 function clearTimeout(timer) {
-  if (timer && timer._onTimeout) {
+  if (timer?._onTimeout) {
     timer._onTimeout = null;
     unenroll(timer);
     return;
 
@@ -49,10 +49,7 @@ function setTimeout(after, value, options = {}) {
         'boolean',
         ref));
   }
-  // TODO(@jasnell): If a decision is made that this cannot be backported
-  // to 12.x, then this can be converted to use optional chaining to
-  // simplify the check.
-  if (signal && signal.aborted) {
+  if (signal?.aborted) {
     return PromiseReject(new AbortError());
   }
   let oncancel;
@@ -94,10 +91,7 @@ function setImmediate(value, options = {}) {
         'boolean',
         ref));
   }
-  // TODO(@jasnell): If a decision is made that this cannot be backported
-  // to 12.x, then this can be converted to use optional chaining to
-  // simplify the check.
-  if (signal && signal.aborted) {
+  if (signal?.aborted) {
     return PromiseReject(new AbortError());
   }
   let oncancel;
Original file line number	Diff line number	Diff line change
@@ -49,10 +49,7 @@ function setTimeout(after, value, options = {}) {
49	49	'boolean',
50	50	ref));
51	51	}
52		- // TODO(@jasnell): If a decision is made that this cannot be backported
53		- // to 12.x, then this can be converted to use optional chaining to
54		- // simplify the check.
55		- if (signal && signal.aborted) {
	52	+ if (signal?.aborted) {
56	53	return PromiseReject(new AbortError());
57	54	}
58	55	let oncancel;
@@ -94,10 +91,7 @@ function setImmediate(value, options = {}) {
94	91	'boolean',
95	92	ref));
96	93	}
97		- // TODO(@jasnell): If a decision is made that this cannot be backported
98		- // to 12.x, then this can be converted to use optional chaining to
99		- // simplify the check.
100		- if (signal && signal.aborted) {
	94	+ if (signal?.aborted) {
101	95	return PromiseReject(new AbortError());
102	96	}
103	97	let oncancel;