Don't take iterable path in ArrayFrom if items[@@iterator] is null

test/mjsunit/harmony/array-from.js

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Flags: --harmony-arrays --harmony-generators
 (function() {
 
 assertEquals(1, Array.from.length);
 
 function assertArrayLikeEquals(value, expected, type) {
@@ skipping 73 matching lines @@
 
   assertArrayLikeEquals(Array.from.call(thisArg, 'test', function(x) {
     return this.filter(x);
   }, {
     filter: function(x) { return x.toUpperCase(); }
   }), ['T', 'E', 'S', 'T'], constructor);
   assertArrayLikeEquals(Array.from.call(thisArg, 'test', function(x) {
     return x.toUpperCase();
   }), ['T', 'E', 'S', 'T'], constructor);
 
-  this.thisArg = thisArg;
-  assertThrows('Array.from.call(thisArg, null)', TypeError);
-  assertThrows('Array.from.call(thisArg, undefined)', TypeError);
-  assertThrows('Array.from.call(thisArg, [], null)', TypeError);
-  assertThrows('Array.from.call(thisArg, [], "noncallable")', TypeError);
+  assertThrows(function() { Array.from.call(thisArg, null); }, TypeError);
+  assertThrows(function() { Array.from.call(thisArg, undefined); }, TypeError);
+  assertThrows(function() { Array.from.call(thisArg, [], null); }, TypeError);
+  assertThrows(function() { Array.from.call(thisArg, [], "noncallable"); },
+               TypeError);
 
-  this.nullIterator = {};
+  var nullIterator = {};
   nullIterator[Symbol.iterator] = null;
-  assertThrows('Array.from.call(thisArg, nullIterator)', TypeError);
+  assertArrayLikeEquals(Array.from.call(thisArg, nullIterator), [],
+                        constructor);
 
-  this.nonObjIterator = {};
+  var nonObjIterator = {};
   nonObjIterator[Symbol.iterator] = function() { return "nonObject"; };
-  assertThrows('Array.from.call(thisArg, nonObjIterator)', TypeError);
+  assertThrows(function() { Array.from.call(thisArg, nonObjIterator); },
+               TypeError);
 
-  assertThrows('Array.from.call(thisArg, [], null)', TypeError);
+  assertThrows(function() { Array.from.call(thisArg, [], null); }, TypeError);
 }
 
 function Other() {}
 
 var boundFn = (function() {}).bind(Array, 27);
 
 testArrayFrom(Array, Array);
 testArrayFrom(null, Array);
 testArrayFrom({}, Array);
 testArrayFrom(Object, Object);
 testArrayFrom(Other, Other);
 testArrayFrom(Math.cos, Array);
 testArrayFrom(Math.cos.bind(Math), Array);
 testArrayFrom(boundFn, boundFn);
 
 })();