1 files changed, 27 insertions, 0 deletions
diff --git a/js/src/tests/non262/String/iterator_edge_cases.js b/js/src/tests/non262/String/iterator_edge_cases.js
new file mode 100644
index 0000000000..15fe6d0fb1
--- /dev/null
+++ b/js/src/tests/non262/String/iterator_edge_cases.js
@@ -0,0 +1,27 @@
+// Test that we can't confuse %StringIteratorPrototype% for a
+// StringIterator object.
+function TestStringIteratorPrototypeConfusion() {
+    var iter = ""[Symbol.iterator]();
+    try {
+        iter.next.call(Object.getPrototypeOf(iter))
+        throw new Error("Call did not throw");
+    } catch (e) {
+        assertEq(e instanceof TypeError, true);
+        assertEq(e.message, "next method called on incompatible String Iterator");
+    }
+}
+TestStringIteratorPrototypeConfusion();
+
+// Tests that we can use %StringIteratorPrototype%.next on a
+// cross-compartment iterator.
+function TestStringIteratorWrappers() {
+    var iter = ""[Symbol.iterator]();
+    assertDeepEq(iter.next.call(newGlobal().eval('"x"[Symbol.iterator]()')),
+		 { value: "x", done: false })
+}
+if (typeof newGlobal === "function") {
+    TestStringIteratorWrappers();
+}
+
+if (typeof reportCompare === "function")
+  reportCompare(true, true);