ES6: Make Map/Set constructors support iterable values

test/mjsunit/es6/collections.js

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 997 matching lines @@
   var s = new ctor(null);
   assertSize(0, s);
 
   s = new ctor(undefined);
   assertSize(0, s);
 
   // No @@iterator
   assertThrows(function() {
     new ctor({});
   }, TypeError);
+  assertThrows(function() {
+    new ctor(true);
+  }, TypeError);
 
   // @@iterator not callable
   assertThrows(function() {
     var object = {};
     object[Symbol.iterator] = 42;
     new ctor(object);
   }, TypeError);
 
   // @@iterator result not object
   assertThrows(function() {
@@ skipping 113 matching lines @@
 TestSetConstructorNextNotAnObject(WeakSet);
 
 
 (function TestWeakSetConstructorNonObjectKeys() {
   assertThrows(function() {
     new WeakSet([1]);
   }, TypeError);
 })();
 
 
+function TestSetConstructorIterableValue(ctor) {
+  'use strict';
+  // Strict mode is required to prevent implicit wrapping in the getter.
+  Object.defineProperty(Number.prototype, Symbol.iterator, {
+    get: function() {
+      assertEquals('object', typeof this);
+      return function() {
+        return oneAndTwo.keys();
+      };
+    },
+    configurable: true
+  });
+
+  var set = new ctor(42);
+  assertSize(2, set);
+  assertTrue(set.has(k1));
+  assertTrue(set.has(k2));
+
+  delete Number.prototype[Symbol.iterator];
+}
+TestSetConstructorIterableValue(Set);
+TestSetConstructorIterableValue(WeakSet);
+
+
+(function TestSetConstructorStringValue() {
+  var s = new Set('abc');
+  assertSize(3, s);
+  assertTrue(s.has('a'));
+  assertTrue(s.has('b'));
+  assertTrue(s.has('c'));
+})();
+
+
 function TestMapConstructor(ctor) {
   var m = new ctor(null);
   assertSize(0, m);
 
   m = new ctor(undefined);
   assertSize(0, m);
 
   // No @@iterator
   assertThrows(function() {
     new ctor({});
   }, TypeError);
+  assertThrows(function() {
+    new ctor(true);
+  }, TypeError);
 
   // @@iterator not callable
   assertThrows(function() {
     var object = {};
     object[Symbol.iterator] = 42;
     new ctor(object);
   }, TypeError);
 
   // @@iterator result not object
   assertThrows(function() {
@@ skipping 121 matching lines @@
 }
 TestMapConstructorIteratorNotObjectValues(Map);
 TestMapConstructorIteratorNotObjectValues(WeakMap);
 
 
 (function TestWeakMapConstructorNonObjectKeys() {
   assertThrows(function() {
     new WeakMap([[1, 2]])
   }, TypeError);
 })();
+
+
+function TestMapConstructorIterableValue(ctor) {
+  'use strict';
+  // Strict mode is required to prevent implicit wrapping in the getter.
+  Object.defineProperty(Number.prototype, Symbol.iterator, {
+    get: function() {
+      assertEquals('object', typeof this);
+      return function() {
+        return oneAndTwo.entries();
+      };
+    },
+    configurable: true
+  });
+
+  var map = new ctor(42);
+  assertSize(2, map);
+  assertEquals(1, map.get(k1));
+  assertEquals(2, map.get(k2));
+
+  delete Number.prototype[Symbol.iterator];
+}
+TestMapConstructorIterableValue(Map);
+TestMapConstructorIterableValue(WeakMap);