fixup! assert,util: fix constructor lookup in deep equal comparison

Author: BridgeAR

lib/internal/util/comparisons.js

@@ -16,7 +16,6 @@ const {
   Date,
   DatePrototypeGetTime,
   Error,
-  Float16Array,
   Float32Array,
   Float64Array,
   Function,
@@ -51,6 +50,7 @@ const {
   Uint8ClampedArray,
   WeakMap,
   WeakSet,
+  globalThis: { Float16Array },
 } = primordials;
 
 const { compare } = internalBinding('buffer');
@@ -59,40 +59,41 @@ const { isURL } = require('internal/url');
 const { isError } = require('internal/util');
 const { Buffer } = require('buffer');
 
-const wellKnownConstructors = new SafeSet();
-wellKnownConstructors.add(Array);
-wellKnownConstructors.add(ArrayBuffer);
-wellKnownConstructors.add(BigInt);
-wellKnownConstructors.add(BigInt64Array);
-wellKnownConstructors.add(BigUint64Array);
-wellKnownConstructors.add(Boolean);
-wellKnownConstructors.add(Buffer);
-wellKnownConstructors.add(DataView);
-wellKnownConstructors.add(Date);
-wellKnownConstructors.add(Error);
+const wellKnownConstructors = new SafeSet()
+  .add(Array)
+  .add(ArrayBuffer)
+  .add(BigInt)
+  .add(BigInt64Array)
+  .add(BigUint64Array)
+  .add(Boolean)
+  .add(Buffer)
+  .add(DataView)
+  .add(Date)
+  .add(Error)
+  .add(Float32Array)
+  .add(Float64Array)
+  .add(Function)
+  .add(Int16Array)
+  .add(Int32Array)
+  .add(Int8Array)
+  .add(Map)
+  .add(Number)
+  .add(Object)
+  .add(Promise)
+  .add(RegExp)
+  .add(Set)
+  .add(String)
+  .add(Symbol)
+  .add(Uint16Array)
+  .add(Uint32Array)
+  .add(Uint8Array)
+  .add(Uint8ClampedArray)
+  .add(WeakMap)
+  .add(WeakSet);
+
 if (Float16Array) { // TODO(BridgeAR): Remove when regularly supported
   wellKnownConstructors.add(Float16Array);
 }
-wellKnownConstructors.add(Float32Array);
-wellKnownConstructors.add(Float64Array);
-wellKnownConstructors.add(Function);
-wellKnownConstructors.add(Int16Array);
-wellKnownConstructors.add(Int32Array);
-wellKnownConstructors.add(Int8Array);
-wellKnownConstructors.add(Map);
-wellKnownConstructors.add(Number);
-wellKnownConstructors.add(Object);
-wellKnownConstructors.add(Promise);
-wellKnownConstructors.add(RegExp);
-wellKnownConstructors.add(Set);
-wellKnownConstructors.add(String);
-wellKnownConstructors.add(Symbol);
-wellKnownConstructors.add(Uint16Array);
-wellKnownConstructors.add(Uint32Array);
-wellKnownConstructors.add(Uint8Array);
-wellKnownConstructors.add(Uint8ClampedArray);
-wellKnownConstructors.add(WeakMap);
-wellKnownConstructors.add(WeakSet);
 
 const types = require('internal/util/types');
 const {

lib/internal/util/inspect.js

@@ -625,24 +625,24 @@ function isInstanceof(object, proto) {
 }
 
 // Special-case for some builtin prototypes in case their `constructor` property has been tampered.
-const wellKnownPrototypes = new SafeMap();
-wellKnownPrototypes.set(ArrayPrototype, { name: 'Array', constructor: Array });
-wellKnownPrototypes.set(ArrayBufferPrototype, { name: 'ArrayBuffer', constructor: ArrayBuffer });
-wellKnownPrototypes.set(FunctionPrototype, { name: 'Function', constructor: Function });
-wellKnownPrototypes.set(MapPrototype, { name: 'Map', constructor: Map });
-wellKnownPrototypes.set(SetPrototype, { name: 'Set', constructor: Set });
-wellKnownPrototypes.set(ObjectPrototype, { name: 'Object', constructor: Object });
-wellKnownPrototypes.set(TypedArrayPrototype, { name: 'TypedArray', constructor: TypedArray });
-wellKnownPrototypes.set(RegExpPrototype, { name: 'RegExp', constructor: RegExp });
-wellKnownPrototypes.set(DatePrototype, { name: 'Date', constructor: Date });
-wellKnownPrototypes.set(DataViewPrototype, { name: 'DataView', constructor: DataView });
-wellKnownPrototypes.set(ErrorPrototype, { name: 'Error', constructor: Error });
-wellKnownPrototypes.set(BooleanPrototype, { name: 'Boolean', constructor: Boolean });
-wellKnownPrototypes.set(NumberPrototype, { name: 'Number', constructor: Number });
-wellKnownPrototypes.set(StringPrototype, { name: 'String', constructor: String });
-wellKnownPrototypes.set(PromisePrototype, { name: 'Promise', constructor: Promise });
-wellKnownPrototypes.set(WeakMapPrototype, { name: 'WeakMap', constructor: WeakMap });
-wellKnownPrototypes.set(WeakSetPrototype, { name: 'WeakSet', constructor: WeakSet });
+const wellKnownPrototypes = new SafeMap()
+  .set(ArrayPrototype, { name: 'Array', constructor: Array })
+  .set(ArrayBufferPrototype, { name: 'ArrayBuffer', constructor: ArrayBuffer })
+  .set(FunctionPrototype, { name: 'Function', constructor: Function })
+  .set(MapPrototype, { name: 'Map', constructor: Map })
+  .set(SetPrototype, { name: 'Set', constructor: Set })
+  .set(ObjectPrototype, { name: 'Object', constructor: Object })
+  .set(TypedArrayPrototype, { name: 'TypedArray', constructor: TypedArray })
+  .set(RegExpPrototype, { name: 'RegExp', constructor: RegExp })
+  .set(DatePrototype, { name: 'Date', constructor: Date })
+  .set(DataViewPrototype, { name: 'DataView', constructor: DataView })
+  .set(ErrorPrototype, { name: 'Error', constructor: Error })
+  .set(BooleanPrototype, { name: 'Boolean', constructor: Boolean })
+  .set(NumberPrototype, { name: 'Number', constructor: Number })
+  .set(StringPrototype, { name: 'String', constructor: String })
+  .set(PromisePrototype, { name: 'Promise', constructor: Promise })
+  .set(WeakMapPrototype, { name: 'WeakMap', constructor: WeakMap })
+  .set(WeakSetPrototype, { name: 'WeakSet', constructor: WeakSet });
 
 function getConstructorName(obj, ctx, recurseTimes, protoProps) {
   let firstProto;