ES6: Add support for Map and Set Iterator

src/bootstrapper.cc

Index: src/bootstrapper.cc
diff --git a/src/bootstrapper.cc b/src/bootstrapper.cc
index f99c852eaf0a23ff24ad698694c60603cb4d0a02..cdeb2ed5cb42a6ec6872e6cf67503ab785806ab6 100644
--- a/src/bootstrapper.cc
+++ b/src/bootstrapper.cc
@@ -1311,14 +1311,31 @@ void Genesis::InitializeExperimentalGlobal() {
                       Builtins::kIllegal, true, true);
     }
     {   // -- S e t I t e r a t o r
-      Handle<Map> map = isolate()->factory()->NewMap(
-          JS_SET_ITERATOR_TYPE, JSSetIterator::kSize);
-      native_context()->set_set_iterator_map(*map);
+      Handle<JSObject> builtins(native_context()->builtins());
+      Handle<JSObject> set_iterator_prototype =
+          factory()->NewJSObject(isolate()->object_function(), TENURED);
+      Handle<JSFunction> set_iterator_function =
+          InstallFunction(builtins, "SetIterator", JS_SET_ITERATOR_TYPE,
+                          JSSetIterator::kSize,
+                          set_iterator_prototype,
+                          Builtins::kIllegal, true, false);
+
+      Map* map = set_iterator_function->initial_map();
+      native_context()->set_set_iterator_map(map);
     }
     {   // -- M a p I t e r a t o r
-      Handle<Map> map = isolate()->factory()->NewMap(
-          JS_MAP_ITERATOR_TYPE, JSMapIterator::kSize);
-      native_context()->set_map_iterator_map(*map);
+      Handle<JSObject> builtins(native_context()->builtins());
+      Handle<JSObject> map_iterator_prototype =
+          factory()->NewJSObject(isolate()->object_function(), TENURED);
+
+      Handle<JSFunction> map_iterator_function =
+          InstallFunction(builtins, "MapIterator", JS_MAP_ITERATOR_TYPE,
+                          JSMapIterator::kSize,
+                          map_iterator_prototype,
+                          Builtins::kIllegal, true, false);
+
+      Map* map = map_iterator_function->initial_map();
+      native_context()->set_map_iterator_map(map);
     }
   }
 
@@ -1991,6 +2008,8 @@ bool Genesis::InstallExperimentalNatives() {
     INSTALL_EXPERIMENTAL_NATIVE(i, strings, "harmony-string.js")
     INSTALL_EXPERIMENTAL_NATIVE(i, arrays, "harmony-array.js")
     INSTALL_EXPERIMENTAL_NATIVE(i, maths, "harmony-math.js")
+    INSTALL_EXPERIMENTAL_NATIVE(i, collection_iterators,
+        "collection-iterator.js")
   }
 
   InstallExperimentalNativeFunctions();