Update references to global object after deserializing context.

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"
@@ skipping 20 matching lines @@
   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;
 }
 
 
-Handle<Context> Snapshot::NewContextFromSnapshot(Isolate* isolate) {
+MaybeHandle<Context> Snapshot::NewContextFromSnapshot(
+    Isolate* isolate, Handle<FixedArray>* outdated_contexts_out) {
   if (!HaveASnapshotToStartFrom()) return Handle<Context>();
   base::ElapsedTimer timer;
   if (FLAG_profile_deserialization) timer.Start();
 
   const v8::StartupData blob = SnapshotBlob();
   Vector<const byte> context_data = ExtractContextData(&blob);
   SnapshotData snapshot_data(context_data);
   Deserializer deserializer(&snapshot_data);
-  Object* root;
-  deserializer.DeserializePartial(isolate, &root);
-  CHECK(root->IsContext());
+
+  MaybeHandle<Object> maybe_context =
+      deserializer.DeserializePartial(isolate, outdated_contexts_out);
+  Handle<Object> result;
+  if (!maybe_context.ToHandle(&result)) return MaybeHandle<Context>();
+  CHECK(result->IsContext());

[jochen (gone - plz use gerrit), 2015/01/12 19:57:10]

maybe also check that the outdated contexts is a fixed array?

[Yang, 2015/01/13 08:20:11]

Added the check to DeserializePartial, where its casted to FixedArray.

   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>(Context::cast(root));
+  return Handle<Context>::cast(result);
 }
 
 
 v8::StartupData Snapshot::CreateSnapshotBlob(
     const Vector<const byte> startup_data,
     const Vector<const byte> context_data) {
   int startup_length = startup_data.length();
   int context_length = context_data.length();
   int context_offset = kIntSize + startup_length;
   int length = context_offset + context_length;
@@ skipping 23 matching lines @@
   int startup_length;
   memcpy(&startup_length, data->data, kIntSize);
   int context_offset = kIntSize + 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