Backed out changesets 6d72b823b67f and acdff324d588 (bug 907077) for …

…ASAN debug jit-test failures.

addon-sdk/source/lib/sdk/deprecated/list.js

@@ -8,7 +8,6 @@ module.metadata = {
 };
 
 const { Trait } = require('../deprecated/traits');
-const { iteratorSymbol } = require('../util/iteration');
 
 /**
  * @see https://jetpack.mozillalabs.com/sdk/latest/docs/#module/api-utils/list
@@ -39,7 +38,7 @@ exports.Iterable = Iterable;
  * elements of the list). List is a base trait and is meant to be a part of
  * composition, since all of it's API is private except length property.
  */
-const listOptions = {
+const List = Trait.resolve({ toString: null }).compose({
   _keyValueMap: null,
   /**
    * List constructor can take any number of element to populate itself.
@@ -115,12 +114,12 @@ const listOptions = {
     for (let element of array)
       yield onKeyValue ? [++i, element] : onKeys ? ++i : element;
   },
-};
-listOptions[iteratorSymbol] = function* iterator() {
-  let array = this._keyValueMap.slice(0);
+  iterator: function iterator() {
+    let array = this._keyValueMap.slice(0);
 
-  for (let element of array)
-    yield element;
-}
-const List = Trait.resolve({ toString: null }).compose(listOptions);
+    for (let element of array)
+      yield element;
+  }
+
+});
 exports.List = List;

addon-sdk/source/lib/sdk/selection.js

@@ -22,8 +22,7 @@ const { Ci, Cc } = require("chrome"),
     { getTabs, getTabContentWindow, getTabForContentWindow,
       getAllTabContentWindows } = require('./tabs/utils'),
     winUtils = require("./window/utils"),
-    events = require("./system/events"),
-    { iteratorSymbol, forInIterator } = require("./util/iteration");
+    events = require("./system/events");
 
 // The selection types
 const HTML = 0x01,
@@ -100,26 +99,25 @@ const selectionListener = {
  * is returned because the text field selection APIs doesn't support
  * multiple selections.
  */
-function* forOfIterator() {
-  let selection = getSelection(DOM);
-  let count = 0;
+function iterator() {
+    let selection = getSelection(DOM);
+    let count = 0;
 
-  if (selection)
-    count = selection.rangeCount || (getElementWithSelection() ? 1 : 0);
+    if (selection)
+      count = selection.rangeCount || (getElementWithSelection() ? 1 : 0);
 
-  for (let i = 0; i < count; i++) {
-    let sel = Selection(i);
+    for (let i = 0; i < count; i++) {
+      let sel = Selection(i);
 
-    if (sel.text)
-      yield Selection(i);
-  }
+      if (sel.text)
+        yield Selection(i);
+    }
 }
 
-const selectionIteratorOptions = {
-  __iterator__: forInIterator
-}
-selectionIteratorOptions[iteratorSymbol] = forOfIterator;
-const selectionIterator = obscure(selectionIteratorOptions);
+const selectionIterator = obscure({
+  __iterator__: iterator, // for...in; for each...in
+  iterator: iterator // for....of
+});
 
 /**
  * Returns the most recent focused window.

addon-sdk/source/lib/sdk/util/list.js

@@ -9,9 +9,8 @@ module.metadata = {
 
 const { Class } = require('../core/heritage');
 const listNS = require('../core/namespace').ns();
-const { iteratorSymbol } = require('../util/iteration');
 
-const listOptions = {
+const List = Class({
   /**
    * List constructor can take any number of element to populate itself.
    * @params {Object|String|Number} element
@@ -47,11 +46,14 @@ const listOptions = {
     for each(let element in array)
       yield onKeyValue ? [++i, element] : onKeys ? ++i : element;
   },
-};
-listOptions[iteratorSymbol] = function iterator() {
-    return listNS(this).keyValueMap.slice(0)[iteratorSymbol]();
-};
-const List = Class(listOptions);
+  iterator: function iterator() {
+    let array = listNS(this).keyValueMap.slice(0),
+                i = -1;
+
+    for (let element of array)
+      yield element;
+  }
+});
 exports.List = List;
 
 function addListItem(that, value) {

content/html/content/test/test_formelements.html

@@ -52,7 +52,7 @@
 is(names[9], "something", "Entry 10")
 is(names[10], "item", "Entry 11")
 is(names[11], "namedItem", "Entry 12")
-is(names[12], "@@iterator", "Entry 13")
+is(names[12], "iterator", "Entry 13")
 is(names[13], "length", "Entry 14")
 </script>
 </pre>

content/html/content/test/test_htmlcollection.html

@@ -40,7 +40,7 @@
 is(names[8], "something", "Entry 9")
 is(names[9], "item", "Entry 10")
 is(names[10], "namedItem", "Entry 11")
-is(names[11], "@@iterator", "Entry 12")
+is(names[11], "iterator", "Entry 12")
 is(names[12], "length", "Entry 13")
 </script>
 </pre>

content/html/content/test/test_rowscollection.html

@@ -52,7 +52,7 @@
 is(names[10], "something", "Entry 11")
 is(names[11], "item", "Entry 12")
 is(names[12], "namedItem", "Entry 13")
-is(names[13], "@@iterator", "Entry 14")
+is(names[13], "iterator", "Entry 14")
 is(names[14], "length", "Entry 15")
 </script>
 </pre>

dom/bindings/Codegen.py

@@ -1514,9 +1514,9 @@ def allAncestorsAbstract(iface):
 
         # FIXME Check for an existing iterator on the interface first.
         if any(m.isGetter() and m.isIndexed() for m in methods):
-            self.regular.append({"name": "@@iterator",
+            self.regular.append({"name": 'iterator',
                                  "methodInfo": False,
-                                 "selfHostedName": "ArrayIterator",
+                                 "nativeName": "JS_ArrayIterator",
                                  "length": 0,
                                  "flags": "JSPROP_ENUMERATE",
                                  "condition": MemberCondition(None, None) })

dom/bindings/parser/WebIDL.py

@@ -320,7 +320,7 @@ def __init__(self, location, name, allowDoubleUnderscore = False,
                               [location])
         if name[0] == '_' and not allowDoubleUnderscore:
             name = name[1:]
-        if (name in ["constructor", "toString", "toJSON"] and
+        if (name in ["constructor", "iterator", "toString", "toJSON"] and
             not allowForbidden):
             raise WebIDLError("Cannot use reserved identifier '%s'" % (name),
                               [location])

dom/bindings/test/test_forOf.html

@@ -50,12 +50,20 @@
     }
     is(log, "egg0;egg1;egg2;egg3;", "'for (x of div.childNodes)' should see elements added during iteration");
 
+    var iter1 = basket.childNodes.iterator();
+    var iter2 = basket.childNodes.iterator();
+    isnot(iter1, iter2, "nodelist.iterator() returns a new iterator each time");
+
     log = '';
     basket.appendChild(document.createTextNode("some text"));
     for (var x of basket.children)
         log += x.id + ";";
     is(log, "egg0;egg1;egg2;egg3;", "'for (x of div.children)' should iterate over child elements");
 
+    var iter1 = basket.children.iterator();
+    var iter2 = basket.children.iterator();
+    isnot(iter1, iter2, ".iterator() returns a new iterator each time");
+
     var count = 0;
     for (var x of document.getElementsByClassName("hazardous-materials"))
         count++;

js/src/Makefile.in

@@ -648,7 +648,6 @@ selfhosting_srcs := \
   $(srcdir)/builtin/Date.js \
   $(srcdir)/builtin/Intl.js \
   $(srcdir)/builtin/IntlData.js \
-  $(srcdir)/builtin/Iterator.js \
   $(srcdir)/builtin/Number.js \
   $(srcdir)/builtin/ParallelArray.js \
   $(srcdir)/builtin/String.js \

js/src/builtin/Map.js

@@ -24,10 +24,13 @@ function MapForEach(callbackfn, thisArg = undefined) {
     /* Step 6-8. */
     var entries = std_Map_iterator.call(M);
     while (true) {
-        var result = std_Map_iterator_next.call(entries);
-        if (result.done)
-            break;
-        var entry = result.value;
+        try {
+            var entry = std_Map_iterator_next.call(entries);
+        } catch (err) {
+            if (err instanceof StopIteration)
+                break;
+            throw err;
+        }
         callFunction(callbackfn, thisArg, entry[1], entry[0], M);
     }
 }