NewGC: Merge bleeding edge up to 9009.

src/weakmap.js

Index: src/weakmap.js
===================================================================
--- src/weakmap.js	(revision 9006)
+++ src/weakmap.js	(working copy)
@@ -33,14 +33,13 @@
 
 // -------------------------------------------------------------------
 
-// Set the WeakMap function and constructor.
-%SetCode($WeakMap, function(x) {
+function WeakMapConstructor() {
   if (%_IsConstructCall()) {
     %WeakMapInitialize(this);
   } else {
     return new $WeakMap();
   }
-});
+}
 
 
 function WeakMapGet(key) {
@@ -82,6 +81,12 @@
 // -------------------------------------------------------------------
 
 function SetupWeakMap() {
+  // Setup the WeakMap constructor function.
+  %SetCode($WeakMap, WeakMapConstructor);
+
+  // Setup the WeakMap prototype object.
+  %FunctionSetPrototype($WeakMap, new $WeakMap());
+
   // Setup the non-enumerable functions on the WeakMap prototype object.
   InstallFunctionsOnHiddenPrototype($WeakMap.prototype, DONT_ENUM, $Array(
     "get", WeakMapGet,