From a4f3206b767bee8ef3e0e1dc8bdbd5e477c5bfa6 Mon Sep 17 00:00:00 2001
From: Brian White <mscdex@mscdex.net>
Date: Sat, 13 Jun 2020 13:35:16 -0400
Subject: [PATCH] events: improve listeners() performance
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PR-URL: https://github.com/nodejs/node/pull/33863
Reviewed-By: Robert Nagy <ronagy@icloud.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Gerhard Stöbich <deb2001-github@yahoo.de>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
---
 benchmark/events/ee-listeners.js | 2 +-
 lib/events.js                    | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/benchmark/events/ee-listeners.js b/benchmark/events/ee-listeners.js
index 08631e95e2165a..9de8d04a175b4b 100644
--- a/benchmark/events/ee-listeners.js
+++ b/benchmark/events/ee-listeners.js
@@ -14,7 +14,7 @@ function main({ n, listeners, raw }) {
 
   for (let k = 0; k < listeners; k += 1) {
     ee.on('dummy0', () => {});
-    ee.on('dummy1', () => {});
+    ee.once('dummy1', () => {});
   }
 
   if (raw === 'true') {
diff --git a/lib/events.js b/lib/events.js
index 06fed54c61bbdc..51259e6821bf23 100644
--- a/lib/events.js
+++ b/lib/events.js
@@ -22,7 +22,6 @@
 'use strict';
 
 const {
-  Array,
   Boolean,
   Error,
   MathMin,
@@ -613,9 +612,11 @@ function arrayClone(arr) {
 }
 
 function unwrapListeners(arr) {
-  const ret = new Array(arr.length);
+  const ret = arrayClone(arr);
   for (let i = 0; i < ret.length; ++i) {
-    ret[i] = arr[i].listener || arr[i];
+    const orig = ret[i].listener;
+    if (typeof orig === 'function')
+      ret[i] = orig;
   }
   return ret;
 }