Revert of Debugger: use a Map to cache mirrors.

src/bootstrapper.cc

 // 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.
 
 #include "src/bootstrapper.h"
 
 #include "src/accessors.h"
 #include "src/api-natives.h"
 #include "src/base/utils/random-number-generator.h"
 #include "src/code-stubs.h"
@@ skipping 1784 matching lines @@
   // Reset property cell type before (re)initializing.
   JSBuiltinsObject::InvalidatePropertyCell(builtins, name_string);
   JSObject::SetOwnPropertyIgnoreAttributes(builtins, name_string, typed_array,
                                            FROZEN)
       .Assert();
   return data;
 }
 
 
 void Genesis::InitializeBuiltinTypedArrays() {
-  // The serializer cannot serialize typed arrays. Reset those typed arrays
-  // for each new context.
-  DCHECK(!isolate()->serializer_enabled());
   Handle<JSBuiltinsObject> builtins(native_context()->builtins());
   {  // Initially seed the per-context random number generator using the
     // per-isolate random number generator.
     const size_t num_elements = 2;
     const size_t num_bytes = num_elements * sizeof(uint32_t);
     uint32_t* state = SetBuiltinTypedArray<uint32_t>(isolate(), builtins,
                                                      kExternalUint32Array, NULL,
                                                      num_elements, "rngstate");
     do {
       isolate()->random_number_generator()->NextBytes(state, num_bytes);
@@ skipping 1408 matching lines @@
 
     if (context_type != THIN_CONTEXT) {
       if (!ConfigureGlobalObjects(global_proxy_template)) return;
     }
     isolate->counters()->contexts_created_from_scratch()->Increment();
   }
 
   // Install experimental and extra natives. Do not include them into the
   // snapshot as we should be able to turn them off at runtime. Re-installing
   // them after they have already been deserialized would also fail.
-  if (!isolate->serializer_enabled() && context_type != THIN_CONTEXT) {
-    InitializeExperimentalGlobal();
-    InitializeBuiltinTypedArrays();
-    if (context_type == FULL_CONTEXT) {
+  if (context_type == FULL_CONTEXT) {
+    if (!isolate->serializer_enabled()) {
+      InitializeExperimentalGlobal();
       if (!InstallExperimentalNatives()) return;
       if (!InstallExtraNatives()) return;
       // By now the utils object is useless and can be removed.
       native_context()->set_natives_utils_object(
           isolate->heap()->undefined_value());
-      InitializeBuiltinTypedArrays();
-    } else {
-      DCHECK_EQ(DEBUG_CONTEXT, context_type);
-      if (!InstallDebuggerNatives()) return;
     }
+
+    // The serializer cannot serialize typed arrays. Reset those typed arrays
+    // for each new context.
+    InitializeBuiltinTypedArrays();
+  } else if (context_type == DEBUG_CONTEXT) {
+    DCHECK(!isolate->serializer_enabled());
+    InitializeExperimentalGlobal();
+    if (!InstallDebuggerNatives()) return;
   }
+
   result_ = native_context();
 }
 
 
 // Support for thread preemption.
 
 // Reserve space for statics needing saving and restoring.
 int Bootstrapper::ArchiveSpacePerThread() {
   return sizeof(NestingCounterType);
 }
@@ skipping 14 matching lines @@
 }
 
 
 // Called when the top-level V8 mutex is destroyed.
 void Bootstrapper::FreeThreadResources() {
   DCHECK(!IsActive());
 }
 
 }  // namespace internal
 }  // namespace v8