lib: improve control abstraction coverage in frozen intrinsics

Signed-off-by: Renegade334 <contact.9a5d6388@renegade334.me.uk>

Author: Renegade334

lib/internal/freeze_intrinsics.js

@@ -63,9 +63,13 @@ const {
   Int32ArrayPrototype,
   Int8Array,
   Int8ArrayPrototype,
+  Iterator,
+  IteratorFrom,
   IteratorPrototype,
+  IteratorPrototypeDrop,
   Map,
   MapPrototype,
+  MapPrototypeSymbolIterator,
   Number,
   NumberPrototype,
   Object,
@@ -88,15 +92,15 @@ const {
   ReflectOwnKeys,
   RegExp,
   RegExpPrototype,
+  RegExpPrototypeSymbolMatchAll,
   SafeSet,
   Set,
   SetPrototype,
+  SetPrototypeSymbolIterator,
   String,
   StringIteratorPrototype,
   StringPrototype,
   Symbol,
-  SymbolIterator,
-  SymbolMatchAll,
   SymbolPrototype,
   SyntaxError,
   SyntaxErrorPrototype,
@@ -136,6 +140,16 @@ const {
   WebAssembly,
 } = globalThis;
 
+const AsyncFunctionPrototype = ObjectGetPrototypeOf(async function() {});
+const AsyncGeneratorFunctionPrototype = ObjectGetPrototypeOf(async function*() {});
+const GeneratorFunctionPrototype = ObjectGetPrototypeOf(function*() {});
+const IteratorHelperPrototype = ObjectGetPrototypeOf(IteratorPrototypeDrop({ __proto__: null }, null));
+const MapIteratorPrototype = ObjectGetPrototypeOf(MapPrototypeSymbolIterator(new Map()));
+// eslint-disable-next-line node-core/avoid-prototype-pollution, regexp/no-empty-group
+const RegExpStringIteratorPrototype = ObjectGetPrototypeOf(RegExpPrototypeSymbolMatchAll(/(?:)/));
+const SetIteratorPrototype = ObjectGetPrototypeOf(SetPrototypeSymbolIterator(new Set()));
+const WrapForValidIteratorPrototype = ObjectGetPrototypeOf(IteratorFrom({ __proto__: null }));
+
 module.exports = function() {
   const { Console } = require('internal/console/constructor');
   const console = require('internal/console/global');
@@ -173,8 +187,7 @@ module.exports = function() {
     StringPrototype, // 22.1
     StringIteratorPrototype, // 22.1.5
     RegExpPrototype, // 22.2
-    // 22.2.7 RegExpStringIteratorPrototype
-    ObjectGetPrototypeOf(/e/[SymbolMatchAll]()),
+    RegExpStringIteratorPrototype, // 22.2.9
 
     // 23 Indexed Collections
     ArrayPrototype, // 23.1
@@ -195,11 +208,9 @@ module.exports = function() {
 
     // 24 Keyed Collections
     MapPrototype, // 24.1
-    // 24.1.5 MapIteratorPrototype
-    ObjectGetPrototypeOf(new Map()[SymbolIterator]()),
+    MapIteratorPrototype, // 24.1.5
     SetPrototype, // 24.2
-    // 24.2.5 SetIteratorPrototype
-    ObjectGetPrototypeOf(new Set()[SymbolIterator]()),
+    SetIteratorPrototype, // 24.2.6
     WeakMapPrototype, // 24.3
     WeakSetPrototype, // 24.4
 
@@ -212,10 +223,18 @@ module.exports = function() {
     FinalizationRegistryPrototype, // 26.2
 
     // 27 Control Abstraction Objects
-    // 27.1 Iteration
-    IteratorPrototype, // 27.1.2 IteratorPrototype
-    AsyncIteratorPrototype, // 27.1.3 AsyncIteratorPrototype
+    IteratorHelperPrototype, // 27.1.2
+    IteratorPrototype, // 27.1.3
+    WrapForValidIteratorPrototype, // 27.1.3.2.2.1
+    AsyncIteratorPrototype, // 27.1.4
     PromisePrototype, // 27.2
+    GeneratorFunctionPrototype, // 27.3
+    AsyncGeneratorFunctionPrototype, // 27.4
+    // 27.5 GeneratorPrototype
+    GeneratorFunctionPrototype.prototype,
+    // 27.6 AsyncGeneratorPrototype
+    AsyncGeneratorFunctionPrototype.prototype,
+    AsyncFunctionPrototype, // 27.7
 
     // Other APIs / Web Compatibility
     Console.prototype,
@@ -268,8 +287,7 @@ module.exports = function() {
     String, // 22.1
     StringIteratorPrototype, // 22.1.5
     RegExp, // 22.2
-    // 22.2.7 RegExpStringIteratorPrototype
-    ObjectGetPrototypeOf(/e/[SymbolMatchAll]()),
+    RegExpStringIteratorPrototype, // 22.2.9
 
     // 23 Indexed Collections
     Array, // 23.1
@@ -290,11 +308,9 @@ module.exports = function() {
 
     // 24 Keyed Collections
     Map, // 24.1
-    // 24.1.5 MapIteratorPrototype
-    ObjectGetPrototypeOf(new Map()[SymbolIterator]()),
+    MapIteratorPrototype, // 24.1.5
     Set, // 24.2
-    // 24.2.5 SetIteratorPrototype
-    ObjectGetPrototypeOf(new Set()[SymbolIterator]()),
+    SetIteratorPrototype, // 24.2.6
     WeakMap, // 24.3
     WeakSet, // 24.4
 
@@ -310,19 +326,19 @@ module.exports = function() {
     FinalizationRegistry, // 26.2
 
     // 27 Control Abstraction Objects
-    // 27.1 Iteration
-    ObjectGetPrototypeOf(ArrayIteratorPrototype), // 27.1.2 IteratorPrototype
-    // 27.1.3 AsyncIteratorPrototype
-    ObjectGetPrototypeOf(ObjectGetPrototypeOf(ObjectGetPrototypeOf(
-      (async function*() {})(),
-    ))),
+    IteratorHelperPrototype, // 27.1.2
+    Iterator, // 27.1.3
+    WrapForValidIteratorPrototype, // 27.1.3.2.2.1
+    ArrayIteratorPrototype, // 27.1.4
     Promise, // 27.2
     // 27.3 GeneratorFunction
-    ObjectGetPrototypeOf(function* () {}),
+    // 27.5 Generator
+    GeneratorFunctionPrototype,
     // 27.4 AsyncGeneratorFunction
-    ObjectGetPrototypeOf(async function* () {}),
+    // 27.6 AsyncGenerator
+    AsyncGeneratorFunctionPrototype,
     // 27.7 AsyncFunction
-    ObjectGetPrototypeOf(async function() {}),
+    AsyncFunctionPrototype,
 
     // 28 Reflection
     // eslint-disable-next-line node-core/prefer-primordials