Fix Harmony sets and maps to allow null as key.

test/mjsunit/harmony/collections.js

 // Copyright 2011 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 34 matching lines @@
   assertDoesNotThrow(function () { m.delete(new Object) });
 }
 TestValidMapCalls(new Map);
 TestValidMapCalls(new WeakMap);
 
 
 // Test invalid getter and setter calls for WeakMap only
 function TestInvalidCalls(m) {
   assertThrows(function () { m.get(undefined) }, TypeError);
   assertThrows(function () { m.set(undefined, 0) }, TypeError);
+  assertThrows(function () { m.get(null) }, TypeError);
+  assertThrows(function () { m.set(null, 0) }, TypeError);
   assertThrows(function () { m.get(0) }, TypeError);
   assertThrows(function () { m.set(0, 0) }, TypeError);
   assertThrows(function () { m.get('a-key') }, TypeError);
   assertThrows(function () { m.set('a-key', 0) }, TypeError);
 }
 TestInvalidCalls(new WeakMap);
 
 
 // Test expected behavior for Sets
 function TestSet(set, key) {
   assertFalse(set.has(key));
   set.add(key);
   assertTrue(set.has(key));
   set.delete(key);
   assertFalse(set.has(key));
 }
 function TestSetBehavior(set) {
-  for (i = 0; i < 20; i++) {
+  for (var i = 0; i < 20; i++) {

[rossberg, 2011/11/02 15:17:37]

Ts-ts-ts.

     TestSet(set, new Object);
   }
 }
 TestSet(new Set, 23);
 TestSet(new Set, 'foo');
 TestSetBehavior(new Set);
 
 
 // Test expected mapping behavior for Maps and WeakMaps
 function TestMapping(map, key, value) {
   map.set(key, value);
   assertSame(value, map.get(key));
 }
 function TestMapBehavior1(m) {
   TestMapping(m, new Object, 23);
   TestMapping(m, new Object, 'the-value');
   TestMapping(m, new Object, new Object);
 }
 TestMapBehavior1(new Map);
 TestMapBehavior1(new WeakMap);
 
 
 // Test expected mapping behavior for Maps only
 function TestMapBehavior2(m) {
   for (var i = 0; i < 20; i++) {
     TestMapping(m, i, new Object);
     TestMapping(m, i / 10, new Object);
     TestMapping(m, 'key-' + i, new Object);
   }
-  var keys = [ +0, -0, +Infinity, -Infinity, true, false ];
+  var keys = [ +0, -0, +Infinity, -Infinity, true, false, null ];
   for (var i = 0; i < keys.length; i++) {
     TestMapping(m, keys[i], new Object);
   }
 }
 TestMapBehavior2(new Map);
 
 
 // Test expected querying behavior of Maps and WeakMaps
 function TestQuery(m) {
   var key = new Object;
@@ skipping 64 matching lines @@
 TestEnumerable(Map);
 TestEnumerable(WeakMap);
 
 
 // Test arbitrary properties on Maps and WeakMaps
 function TestArbitrary(m) {
   function TestProperty(map, property, value) {
     map[property] = value;
     assertEquals(value, map[property]);
   }
-  for (i = 0; i < 20; i++) {
+  for (var i = 0; i < 20; i++) {
     TestProperty(m, i, 'val' + i);
     TestProperty(m, 'foo' + i, 'bar' + i);
   }
   TestMapping(m, new Object, 'foobar');
 }
 TestArbitrary(new Map);
 TestArbitrary(new WeakMap);
 
 
 // Test direct constructor call
@@ skipping 66 matching lines @@
   configurable: true,
   writable: true
 }});
 assertEquals(10, o.myValue);
 
 
 // Stress Test
 // There is a proposed stress-test available at the es-discuss mailing list
 // which cannot be reasonably automated.  Check it out by hand if you like:
 // https://mail.mozilla.org/pipermail/es-discuss/2011-May/014096.html