fixup! events: refactor to use more primordials

This reverts commit 940bd12.
nodejs · Dec 18, 2020 · 9863b29 · 9863b29
1 parent 7a158a2
commit 9863b29
Showing 1 changed file with 5 additions and 16 deletions.
diff --git a/lib/events.js b/lib/events.js
@@ -33,10 +33,8 @@ const {
   Boolean,
   Error,
   ErrorCaptureStackTrace,
-  Function,
   FunctionPrototypeBind,
   FunctionPrototypeCall,
-  FunctionPrototypeToString,
   MathMin,
   NumberIsNaN,
   ObjectCreate,
@@ -51,7 +49,6 @@ const {
   ReflectOwnKeys,
   String,
   StringPrototypeSplit,
-  StringPrototypeReplace,
   Symbol,
   SymbolFor,
   SymbolAsyncIterator
@@ -93,6 +90,9 @@ const lazyDOMException = hideStackFrames((message, name) => {
 });
 
 
+function EventEmitter(opts) {
+  FunctionPrototypeCall(EventEmitter.init, this, opts);
+}
 module.exports = EventEmitter;
 module.exports.once = once;
 module.exports.on = on;
@@ -199,9 +199,7 @@ EventEmitter.setMaxListeners =
     }
   };
 
-let customInit;
-function EventEmitter(opts) {
-  if (customInit) return FunctionPrototypeCall(customInit, this, opts);
+EventEmitter.init = function(opts) {
 
   if (this._events === undefined ||
       this._events === ObjectGetPrototypeOf(this)._events) {
@@ -223,16 +221,7 @@ function EventEmitter(opts) {
     // prototype lookup in a very sensitive hot path.
     this[kCapture] = EventEmitter.prototype[kCapture];
   }
-}
-ObjectDefineProperty(EventEmitter, 'init', {
-  enumerable: true,
-  get: () =>
-    new Function(StringPrototypeReplace(FunctionPrototypeToString(EventEmitter),
-                                        /^\s*if\s*\(customInit\)/, '')),
-  set: (init) => {
-    customInit = init;
-  }
-});
+};
 
 function addCatch(that, promise, type, args) {
   if (!that[kCapture]) {