fixup! lib: add WeakRef and FinalizationRegistry to primordials

nodejs · Feb 7, 2021 · 846fc79 · 846fc79
1 parent 9a951fa
commit 846fc79
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/lib/internal/per_context/primordials.js b/lib/internal/per_context/primordials.js
@@ -158,7 +158,6 @@ function copyPrototype(src, dest, prefix) {
   'Date',
   'Error',
   'EvalError',
-  'FinalizationRegistry',
   'Float32Array',
   'Float64Array',
   'Function',
@@ -182,7 +181,6 @@ function copyPrototype(src, dest, prefix) {
   'Uint8Array',
   'Uint8ClampedArray',
   'WeakMap',
-  'WeakRef',
   'WeakSet',
 ].forEach((name) => {
   const original = global[name];
@@ -191,6 +189,19 @@ function copyPrototype(src, dest, prefix) {
   copyPrototype(original.prototype, primordials, `${name}Prototype`);
 });
 
+// Copy potentially `undefined` primordials:
+[
+  'FinalizationRegistry',
+  'WeakRef',
+].forEach((name) => {
+  const original = global[name];
+  if (original) {
+    primordials[name] = original;
+    copyPropsRenamed(original, primordials, name);
+    copyPrototype(original.prototype, primordials, `${name}Prototype`);
+  }
+});
+
 // Create copies of intrinsic objects that require a valid `this` to call
 // static methods.
 // Refs: https://www.ecma-international.org/ecma-262/#sec-promise.all
@@ -344,14 +355,14 @@ primordials.SafeWeakSet = makeSafe(
   }
 );
 
-primordials.SafeFinalizationRegistry = makeSafe(
+if (FinalizationRegistry) primordials.SafeFinalizationRegistry = makeSafe(
   FinalizationRegistry,
   class SafeFinalizationRegistry extends FinalizationRegistry {
     // eslint-disable-next-line no-useless-constructor
     constructor(cleanupCallback) { super(cleanupCallback); }
   }
 );
-primordials.SafeWeakRef = makeSafe(
+if (WeakRef) primordials.SafeWeakRef = makeSafe(
   WeakRef,
   class SafeWeakRef extends WeakRef {
     // eslint-disable-next-line no-useless-constructor