Attach snapshot data blob to the isolate.

src/snapshot-common.cc

 // Copyright 2006-2008 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.
 
 // The common functionality when building with or without snapshots.
 
 #include "src/v8.h"
 
 #include "src/api.h"
 #include "src/base/platform/platform.h"
 #include "src/full-codegen.h"
 #include "src/snapshot.h"
 
 namespace v8 {
 namespace internal {
 
-bool Snapshot::HaveASnapshotToStartFrom() {
-  return SnapshotBlob().data != NULL;
-}
-
-
 #ifdef DEBUG
 bool Snapshot::SnapshotIsValid(v8::StartupData* snapshot_blob) {
   return !Snapshot::ExtractStartupData(snapshot_blob).is_empty() &&
          !Snapshot::ExtractContextData(snapshot_blob).is_empty();
 }
 #endif  // DEBUG
 
 
-bool Snapshot::EmbedsScript() {
-  if (!HaveASnapshotToStartFrom()) return false;
-  const v8::StartupData blob = SnapshotBlob();
-  return ExtractMetadata(&blob).embeds_script();
+bool Snapshot::EmbedsScript(Isolate* isolate) {
+  if (!isolate->snapshot_available()) return false;
+  return ExtractMetadata(isolate->snapshot_blob()).embeds_script();
 }
 
 
-uint32_t Snapshot::SizeOfFirstPage(AllocationSpace space) {
+uint32_t Snapshot::SizeOfFirstPage(Isolate* isolate, AllocationSpace space) {
   DCHECK(space >= FIRST_PAGED_SPACE && space <= LAST_PAGED_SPACE);
-  if (!HaveASnapshotToStartFrom()) {
+  if (!isolate->snapshot_available()) {
     return static_cast<uint32_t>(MemoryAllocator::PageAreaSize(space));
   }
   uint32_t size;
   int offset = kFirstPageSizesOffset + (space - FIRST_PAGED_SPACE) * kInt32Size;
-  memcpy(&size, SnapshotBlob().data + offset, kInt32Size);
+  memcpy(&size, isolate->snapshot_blob()->data + offset, kInt32Size);
   return size;
 }
 
 
 bool Snapshot::Initialize(Isolate* isolate) {
-  if (!HaveASnapshotToStartFrom()) return false;
+  if (!isolate->snapshot_available()) return false;
   base::ElapsedTimer timer;
   if (FLAG_profile_deserialization) timer.Start();
 
-  const v8::StartupData blob = SnapshotBlob();
-  Vector<const byte> startup_data = ExtractStartupData(&blob);
+  const v8::StartupData* blob = isolate->snapshot_blob();
+  Vector<const byte> startup_data = ExtractStartupData(blob);
   SnapshotData snapshot_data(startup_data);
   Deserializer deserializer(&snapshot_data);
   bool success = isolate->Init(&deserializer);
   if (FLAG_profile_deserialization) {
     double ms = timer.Elapsed().InMillisecondsF();
     int bytes = startup_data.length();
     PrintF("[Deserializing isolate (%d bytes) took %0.3f ms]\n", bytes, ms);
   }
   return success;
 }
 
 
 MaybeHandle<Context> Snapshot::NewContextFromSnapshot(
     Isolate* isolate, Handle<JSGlobalProxy> global_proxy,
     Handle<FixedArray>* outdated_contexts_out) {
-  if (!HaveASnapshotToStartFrom()) return Handle<Context>();
+  if (!isolate->snapshot_available()) return Handle<Context>();
   base::ElapsedTimer timer;
   if (FLAG_profile_deserialization) timer.Start();
 
-  const v8::StartupData blob = SnapshotBlob();
-  Vector<const byte> context_data = ExtractContextData(&blob);
+  const v8::StartupData* blob = isolate->snapshot_blob();
+  Vector<const byte> context_data = ExtractContextData(blob);
   SnapshotData snapshot_data(context_data);
   Deserializer deserializer(&snapshot_data);
 
   MaybeHandle<Object> maybe_context = deserializer.DeserializePartial(
       isolate, global_proxy, outdated_contexts_out);
   Handle<Object> result;
   if (!maybe_context.ToHandle(&result)) return MaybeHandle<Context>();
   CHECK(result->IsContext());
   // If the snapshot does not contain a custom script, we need to update
   // the global object for exactly one context.
-  CHECK(EmbedsScript() || (*outdated_contexts_out)->length() == 1);
+  CHECK(EmbedsScript(isolate) || (*outdated_contexts_out)->length() == 1);
   if (FLAG_profile_deserialization) {
     double ms = timer.Elapsed().InMillisecondsF();
     int bytes = context_data.length();
     PrintF("[Deserializing context (%d bytes) took %0.3f ms]\n", bytes, ms);
   }
   return Handle<Context>::cast(result);
 }
 
 
 void CalculateFirstPageSizes(bool is_default_snapshot,
@@ skipping 101 matching lines @@
   int startup_length;
   memcpy(&startup_length, data->data + kStartupLengthOffset, kIntSize);
   int context_offset = ContextOffset(startup_length);
   const byte* context_data =
       reinterpret_cast<const byte*>(data->data + context_offset);
   DCHECK_LT(context_offset, data->raw_size);
   int context_length = data->raw_size - context_offset;
   return Vector<const byte>(context_data, context_length);
 }
 } }  // namespace v8::internal