Correctly reference global proxy in the partial snapshot.

test/cctest/test-serialize.cc

 // Copyright 2007-2010 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 376 matching lines @@
 
       const char* file_name = FLAG_testing_serialization_file;
 
       int snapshot_size = 0;
       byte* snapshot = ReadBytes(file_name, &snapshot_size);
 
       Isolate* isolate = reinterpret_cast<Isolate*>(v8_isolate);
       HandleScope handle_scope(isolate);
       Handle<Object> root;
       Handle<FixedArray> outdated_contexts;
+      // Intentionally empty handle. The deserializer should not come across
+      // any references to the global proxy in this test.
+      Handle<JSGlobalProxy> global_proxy = Handle<JSGlobalProxy>::null();
       {
         SnapshotData snapshot_data(Vector<const byte>(snapshot, snapshot_size));
         Deserializer deserializer(&snapshot_data);
-        root = deserializer.DeserializePartial(isolate, &outdated_contexts)
+        root = deserializer.DeserializePartial(isolate, global_proxy,
+                                               &outdated_contexts)
                    .ToHandleChecked();
         CHECK_EQ(0, outdated_contexts->length());
         CHECK(root->IsString());
       }
 
       Handle<Object> root2;
       {
         SnapshotData snapshot_data(Vector<const byte>(snapshot, snapshot_size));
         Deserializer deserializer(&snapshot_data);
-        root2 = deserializer.DeserializePartial(isolate, &outdated_contexts)
+        root2 = deserializer.DeserializePartial(isolate, global_proxy,
+                                                &outdated_contexts)
                     .ToHandleChecked();
         CHECK(root2->IsString());
         CHECK(root.is_identical_to(root2));
       }
     }
     v8_isolate->Dispose();
   }
 }
 
 
@@ skipping 78 matching lines @@
 
       const char* file_name = FLAG_testing_serialization_file;
 
       int snapshot_size = 0;
       byte* snapshot = ReadBytes(file_name, &snapshot_size);
 
       Isolate* isolate = reinterpret_cast<Isolate*>(v8_isolate);
       HandleScope handle_scope(isolate);
       Handle<Object> root;
       Handle<FixedArray> outdated_contexts;
+      Handle<JSGlobalProxy> global_proxy =
+          isolate->factory()->NewUninitializedJSGlobalProxy();
       {
         SnapshotData snapshot_data(Vector<const byte>(snapshot, snapshot_size));
         Deserializer deserializer(&snapshot_data);
-        root = deserializer.DeserializePartial(isolate, &outdated_contexts)
+        root = deserializer.DeserializePartial(isolate, global_proxy,
+                                               &outdated_contexts)
                    .ToHandleChecked();
         CHECK(root->IsContext());
+        CHECK(Handle<Context>::cast(root)->global_proxy() == *global_proxy);
         CHECK_EQ(1, outdated_contexts->length());
       }
 
       Handle<Object> root2;
       {
         SnapshotData snapshot_data(Vector<const byte>(snapshot, snapshot_size));
         Deserializer deserializer(&snapshot_data);
-        root2 = deserializer.DeserializePartial(isolate, &outdated_contexts)
+        root2 = deserializer.DeserializePartial(isolate, global_proxy,
+                                                &outdated_contexts)
                     .ToHandleChecked();
         CHECK(root2->IsContext());
         CHECK(!root.is_identical_to(root2));
       }
     }
     v8_isolate->Dispose();
   }
 }
 
 
@@ skipping 14 matching lines @@
       }
       DCHECK(!env.IsEmpty());
       {
         v8::HandleScope handle_scope(v8_isolate);
         v8::Local<v8::Context>::New(v8_isolate, env)->Enter();
         // After execution, e's function context refers to the global object.
         CompileRun(
             "var e;"
             "(function() {"
             "  e = function(s) { eval (s); }"
-            "})();");
+            "})();"
+            "var o = this;");
       }
       // Make sure all builtin scripts are cached.
       {
         HandleScope scope(isolate);
         for (int i = 0; i < Natives::GetBuiltinsCount(); i++) {
           isolate->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 env.
@@ skipping 50 matching lines @@
 
       const char* file_name = FLAG_testing_serialization_file;
 
       int snapshot_size = 0;
       byte* snapshot = ReadBytes(file_name, &snapshot_size);
 
       Isolate* isolate = reinterpret_cast<Isolate*>(v8_isolate);
       HandleScope handle_scope(isolate);
       Handle<Object> root;
       Handle<FixedArray> outdated_contexts;
+      Handle<JSGlobalProxy> global_proxy =
+          isolate->factory()->NewUninitializedJSGlobalProxy();
       {
         SnapshotData snapshot_data(Vector<const byte>(snapshot, snapshot_size));
         Deserializer deserializer(&snapshot_data);
-        root = deserializer.DeserializePartial(isolate, &outdated_contexts)
+        root = deserializer.DeserializePartial(isolate, global_proxy,
+                                               &outdated_contexts)
                    .ToHandleChecked();
         CHECK_EQ(2, outdated_contexts->length());
         CHECK(root->IsContext());
+        Handle<Context> context = Handle<Context>::cast(root);
+        CHECK(context->global_proxy() == *global_proxy);
+        Handle<String> o = isolate->factory()->NewStringFromAsciiChecked("o");
+        Handle<JSObject> global_object(context->global_object(), isolate);
+        Handle<Object> property = JSObject::GetDataProperty(global_object, o);
+        CHECK(property.is_identical_to(global_proxy));
       }
     }
     v8_isolate->Dispose();
   }
 }
 
 
 TEST(TestThatAlwaysSucceeds) {
 }
 
@@ skipping 680 matching lines @@
     {
       DisallowCompilation no_compile(reinterpret_cast<Isolate*>(isolate2));
       script = v8::ScriptCompiler::CompileUnbound(
           isolate2, &source, v8::ScriptCompiler::kConsumeCodeCache);
     }
     v8::Local<v8::Value> result = script->BindToCurrentContext()->Run();
     CHECK(result->ToString(isolate2)->Equals(v8_str("XY")));
   }
   isolate2->Dispose();
 }