Added a version of the v8::HandleScope constructor with an Isolate and use that consistently.

src/mksnapshot.cc

 // Copyright 2006-2008 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 300 matching lines @@
     exit(1);
   }
 #endif
   i::Serializer::Enable();
   Persistent<Context> context = v8::Context::New();
   if (context.IsEmpty()) {
     fprintf(stderr,
             "\nException thrown while compiling natives - see above.\n\n");
     exit(1);
   }
+  Isolate* isolate = context->GetIsolate();
   if (i::FLAG_extra_code != NULL) {
     context->Enter();
     // Capture 100 frames if anything happens.
     V8::SetCaptureStackTraceForUncaughtExceptions(true, 100);
-    HandleScope scope;
+    HandleScope scope(isolate);
     const char* name = i::FLAG_extra_code;
     FILE* file = i::OS::FOpen(name, "rb");
     if (file == NULL) {
       fprintf(stderr, "Failed to open '%s': errno %d\n", name, errno);
       exit(1);
     }
 
     fseek(file, 0, SEEK_END);
     int size = ftell(file);
     rewind(file);
@@ skipping 32 matching lines @@
       int to = message->GetEndColumn();
       int i;
       for (i = 0; i < from; i++) fprintf(stderr, " ");
       for ( ; i <= to; i++) fprintf(stderr, "^");
       fprintf(stderr, "\n");
       exit(1);
     }
     context->Exit();
   }
   // Make sure all builtin scripts are cached.
-  { HandleScope scope;
+  { HandleScope scope(isolate);
     for (int i = 0; i < i::Natives::GetBuiltinsCount(); i++) {
       i::Isolate::Current()->bootstrapper()->NativesSourceLookup(i);
     }
   }
   // If we don't do this then we end up with a stray root pointing at the
   // context even after we have disposed of the context.
   HEAP->CollectAllGarbage(i::Heap::kNoGCFlags, "mksnapshot");
   i::Object* raw_context = *(v8::Utils::OpenHandle(*context));
   context.Dispose(context->GetIsolate());
   CppByteSink sink(argv[1]);
@@ skipping 28 matching lines @@
   sink.WriteSpaceUsed(
       "",
       ser.CurrentAllocationAddress(i::NEW_SPACE),
       ser.CurrentAllocationAddress(i::OLD_POINTER_SPACE),
       ser.CurrentAllocationAddress(i::OLD_DATA_SPACE),
       ser.CurrentAllocationAddress(i::CODE_SPACE),
       ser.CurrentAllocationAddress(i::MAP_SPACE),
       ser.CurrentAllocationAddress(i::CELL_SPACE));
   return 0;
 }