1 files changed, 52 insertions, 7 deletions
diff --git a/js/src/jsiter.cpp b/js/src/jsiter.cpp
index 749e15d27..c4da86bdb 100644
--- a/js/src/jsiter.cpp
+++ b/js/src/jsiter.cpp
@@ -24,6 +24,7 @@
 #include "jstypes.h"
 #include "jsutil.h"
 
+#include "builtin/SelfHostingDefines.h"
 #include "ds/Sort.h"
 #include "gc/Marking.h"
 #include "js/Proxy.h"
@@ -1135,16 +1136,36 @@ static const JSFunctionSpec string_iterator_methods[] = {
     JS_FS_END
 };
 
+static const Class RegExpStringIteratorPrototypeClass = {
+    "RegExp String Iterator",
+    0
+};
+
 enum {
-    ListIteratorSlotIteratedObject,
-    ListIteratorSlotNextIndex,
-    ListIteratorSlotNextMethod,
-    ListIteratorSlotCount
+    RegExpStringIteratorSlotRegExp,
+    RegExpStringIteratorSlotString,
+    RegExpStringIteratorSlotFlags,
+    RegExpStringIteratorSlotDone,
+    RegExpStringIteratorSlotCount
 };
 
-const Class ListIteratorObject::class_ = {
-    "List Iterator",
-    JSCLASS_HAS_RESERVED_SLOTS(ListIteratorSlotCount)
+static_assert(RegExpStringIteratorSlotRegExp == REGEXP_STRING_ITERATOR_REGEXP_SLOT,
+              "RegExpStringIteratorSlotRegExp must match self-hosting define for regexp slot.");
+static_assert(RegExpStringIteratorSlotString == REGEXP_STRING_ITERATOR_STRING_SLOT,
+              "RegExpStringIteratorSlotString must match self-hosting define for string slot.");
+static_assert(RegExpStringIteratorSlotFlags == REGEXP_STRING_ITERATOR_FLAGS_SLOT,
+              "RegExpStringIteratorSlotFlags must match self-hosting define for flags slot.");
+static_assert(RegExpStringIteratorSlotDone == REGEXP_STRING_ITERATOR_DONE_SLOT,
+              "RegExpStringIteratorSlotDone must match self-hosting define for done slot.");
+
+const Class RegExpStringIteratorObject::class_ = {
+    "RegExp String Iterator",
+    JSCLASS_HAS_RESERVED_SLOTS(RegExpStringIteratorSlotCount)
+};
+
+static const JSFunctionSpec regexp_string_iterator_methods[] = {
+    JS_SELF_HOSTED_FN("next", "RegExpStringIteratorNext", 0, 0),
+    JS_FS_END
 };
 
 JSObject*
@@ -1553,6 +1574,30 @@ GlobalObject::initStringIteratorProto(JSContext* cx, Handle<GlobalObject*> globa
     return true;
 }
 
+/* static */ bool
+GlobalObject::initRegExpStringIteratorProto(JSContext* cx, Handle<GlobalObject*> global)
+{
+    if (global->getReservedSlot(REGEXP_STRING_ITERATOR_PROTO).isObject())
+        return true;
+
+    RootedObject iteratorProto(cx, GlobalObject::getOrCreateIteratorPrototype(cx, global));
+    if (!iteratorProto)
+        return false;
+
+    const Class* cls = &RegExpStringIteratorPrototypeClass;
+    RootedObject proto(cx, GlobalObject::createBlankPrototypeInheriting(cx, global, cls,
+                                                                        iteratorProto));
+    if (!proto ||
+        !DefinePropertiesAndFunctions(cx, proto, nullptr, regexp_string_iterator_methods) ||
+        !DefineToStringTag(cx, proto, cx->names().RegExpStringIterator))
+    {
+        return false;
+    }
+
+    global->setReservedSlot(REGEXP_STRING_ITERATOR_PROTO, ObjectValue(*proto));
+    return true;
+}
+
 JSObject*
 js::InitLegacyIteratorClass(JSContext* cx, HandleObject obj)
 {