Revert of [runtime] Replace global object link with native context link in all contexts.

test/cctest/test-heap.cc

 // Copyright 2012 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 2346 matching lines @@
 
 static int NumberOfGlobalObjects() {
   int count = 0;
   HeapIterator iterator(CcTest::heap());
   for (HeapObject* obj = iterator.next(); obj != NULL; obj = iterator.next()) {
     if (obj->IsJSGlobalObject()) count++;
   }
   // Subtract two to compensate for the two global objects (not global
   // JSObjects, of which there would only be one) that are part of the code stub
   // context, which is always present.
-  return count - 1;
+  return count - 2;
 }
 
 
 // Test that we don't embed maps from foreign contexts into
 // optimized code.
 TEST(LeakNativeContextViaMap) {
   i::FLAG_allow_natives_syntax = true;
   v8::Isolate* isolate = CcTest::isolate();
   v8::HandleScope outer_scope(isolate);
   v8::Persistent<v8::Context> ctx1p;
   v8::Persistent<v8::Context> ctx2p;
   {
     v8::HandleScope scope(isolate);
     ctx1p.Reset(isolate, v8::Context::New(isolate));
     ctx2p.Reset(isolate, v8::Context::New(isolate));
     v8::Local<v8::Context>::New(isolate, ctx1p)->Enter();
   }
 
   CcTest::heap()->CollectAllAvailableGarbage();
-  CHECK_EQ(2, NumberOfGlobalObjects());
+  CHECK_EQ(4, NumberOfGlobalObjects());
 
   {
     v8::HandleScope inner_scope(isolate);
     CompileRun("var v = {x: 42}");
     v8::Local<v8::Context> ctx1 = v8::Local<v8::Context>::New(isolate, ctx1p);
     v8::Local<v8::Context> ctx2 = v8::Local<v8::Context>::New(isolate, ctx2p);
     v8::Local<v8::Value> v =
         ctx1->Global()->Get(ctx1, v8_str("v")).ToLocalChecked();
     ctx2->Enter();
     CHECK(ctx2->Global()->Set(ctx2, v8_str("o"), v).FromJust());
     v8::Local<v8::Value> res = CompileRun(
         "function f() { return o.x; }"
         "for (var i = 0; i < 10; ++i) f();"
         "%OptimizeFunctionOnNextCall(f);"
         "f();");
     CHECK_EQ(42, res->Int32Value(ctx2).FromJust());
     CHECK(ctx2->Global()
               ->Set(ctx2, v8_str("o"), v8::Int32::New(isolate, 0))
               .FromJust());
     ctx2->Exit();
     v8::Local<v8::Context>::New(isolate, ctx1)->Exit();
     ctx1p.Reset();
     isolate->ContextDisposedNotification();
   }
   CcTest::heap()->CollectAllAvailableGarbage();
-  CHECK_EQ(1, NumberOfGlobalObjects());
+  CHECK_EQ(2, NumberOfGlobalObjects());
   ctx2p.Reset();
   CcTest::heap()->CollectAllAvailableGarbage();
   CHECK_EQ(0, NumberOfGlobalObjects());
 }
 
 
 // Test that we don't embed functions from foreign contexts into
 // optimized code.
 TEST(LeakNativeContextViaFunction) {
   i::FLAG_allow_natives_syntax = true;
   v8::Isolate* isolate = CcTest::isolate();
   v8::HandleScope outer_scope(isolate);
   v8::Persistent<v8::Context> ctx1p;
   v8::Persistent<v8::Context> ctx2p;
   {
     v8::HandleScope scope(isolate);
     ctx1p.Reset(isolate, v8::Context::New(isolate));
     ctx2p.Reset(isolate, v8::Context::New(isolate));
     v8::Local<v8::Context>::New(isolate, ctx1p)->Enter();
   }
 
   CcTest::heap()->CollectAllAvailableGarbage();
-  CHECK_EQ(2, NumberOfGlobalObjects());
+  CHECK_EQ(4, NumberOfGlobalObjects());
 
   {
     v8::HandleScope inner_scope(isolate);
     CompileRun("var v = function() { return 42; }");
     v8::Local<v8::Context> ctx1 = v8::Local<v8::Context>::New(isolate, ctx1p);
     v8::Local<v8::Context> ctx2 = v8::Local<v8::Context>::New(isolate, ctx2p);
     v8::Local<v8::Value> v =
         ctx1->Global()->Get(ctx1, v8_str("v")).ToLocalChecked();
     ctx2->Enter();
     CHECK(ctx2->Global()->Set(ctx2, v8_str("o"), v).FromJust());
     v8::Local<v8::Value> res = CompileRun(
         "function f(x) { return x(); }"
         "for (var i = 0; i < 10; ++i) f(o);"
         "%OptimizeFunctionOnNextCall(f);"
         "f(o);");
     CHECK_EQ(42, res->Int32Value(ctx2).FromJust());
     CHECK(ctx2->Global()
               ->Set(ctx2, v8_str("o"), v8::Int32::New(isolate, 0))
               .FromJust());
     ctx2->Exit();
     ctx1->Exit();
     ctx1p.Reset();
     isolate->ContextDisposedNotification();
   }
   CcTest::heap()->CollectAllAvailableGarbage();
-  CHECK_EQ(1, NumberOfGlobalObjects());
+  CHECK_EQ(2, NumberOfGlobalObjects());
   ctx2p.Reset();
   CcTest::heap()->CollectAllAvailableGarbage();
   CHECK_EQ(0, NumberOfGlobalObjects());
 }
 
 
 TEST(LeakNativeContextViaMapKeyed) {
   i::FLAG_allow_natives_syntax = true;
   v8::Isolate* isolate = CcTest::isolate();
   v8::HandleScope outer_scope(isolate);
   v8::Persistent<v8::Context> ctx1p;
   v8::Persistent<v8::Context> ctx2p;
   {
     v8::HandleScope scope(isolate);
     ctx1p.Reset(isolate, v8::Context::New(isolate));
     ctx2p.Reset(isolate, v8::Context::New(isolate));
     v8::Local<v8::Context>::New(isolate, ctx1p)->Enter();
   }
 
   CcTest::heap()->CollectAllAvailableGarbage();
-  CHECK_EQ(2, NumberOfGlobalObjects());
+  CHECK_EQ(4, NumberOfGlobalObjects());
 
   {
     v8::HandleScope inner_scope(isolate);
     CompileRun("var v = [42, 43]");
     v8::Local<v8::Context> ctx1 = v8::Local<v8::Context>::New(isolate, ctx1p);
     v8::Local<v8::Context> ctx2 = v8::Local<v8::Context>::New(isolate, ctx2p);
     v8::Local<v8::Value> v =
         ctx1->Global()->Get(ctx1, v8_str("v")).ToLocalChecked();
     ctx2->Enter();
     CHECK(ctx2->Global()->Set(ctx2, v8_str("o"), v).FromJust());
     v8::Local<v8::Value> res = CompileRun(
         "function f() { return o[0]; }"
         "for (var i = 0; i < 10; ++i) f();"
         "%OptimizeFunctionOnNextCall(f);"
         "f();");
     CHECK_EQ(42, res->Int32Value(ctx2).FromJust());
     CHECK(ctx2->Global()
               ->Set(ctx2, v8_str("o"), v8::Int32::New(isolate, 0))
               .FromJust());
     ctx2->Exit();
     ctx1->Exit();
     ctx1p.Reset();
     isolate->ContextDisposedNotification();
   }
   CcTest::heap()->CollectAllAvailableGarbage();
-  CHECK_EQ(1, NumberOfGlobalObjects());
+  CHECK_EQ(2, NumberOfGlobalObjects());
   ctx2p.Reset();
   CcTest::heap()->CollectAllAvailableGarbage();
   CHECK_EQ(0, NumberOfGlobalObjects());
 }
 
 
 TEST(LeakNativeContextViaMapProto) {
   i::FLAG_allow_natives_syntax = true;
   v8::Isolate* isolate = CcTest::isolate();
   v8::HandleScope outer_scope(isolate);
   v8::Persistent<v8::Context> ctx1p;
   v8::Persistent<v8::Context> ctx2p;
   {
     v8::HandleScope scope(isolate);
     ctx1p.Reset(isolate, v8::Context::New(isolate));
     ctx2p.Reset(isolate, v8::Context::New(isolate));
     v8::Local<v8::Context>::New(isolate, ctx1p)->Enter();
   }
 
   CcTest::heap()->CollectAllAvailableGarbage();
-  CHECK_EQ(2, NumberOfGlobalObjects());
+  CHECK_EQ(4, NumberOfGlobalObjects());
 
   {
     v8::HandleScope inner_scope(isolate);
     CompileRun("var v = { y: 42}");
     v8::Local<v8::Context> ctx1 = v8::Local<v8::Context>::New(isolate, ctx1p);
     v8::Local<v8::Context> ctx2 = v8::Local<v8::Context>::New(isolate, ctx2p);
     v8::Local<v8::Value> v =
         ctx1->Global()->Get(ctx1, v8_str("v")).ToLocalChecked();
     ctx2->Enter();
     CHECK(ctx2->Global()->Set(ctx2, v8_str("o"), v).FromJust());
     v8::Local<v8::Value> res = CompileRun(
         "function f() {"
         "  var p = {x: 42};"
         "  p.__proto__ = o;"
         "  return p.x;"
         "}"
         "for (var i = 0; i < 10; ++i) f();"
         "%OptimizeFunctionOnNextCall(f);"
         "f();");
     CHECK_EQ(42, res->Int32Value(ctx2).FromJust());
     CHECK(ctx2->Global()
               ->Set(ctx2, v8_str("o"), v8::Int32::New(isolate, 0))
               .FromJust());
     ctx2->Exit();
     ctx1->Exit();
     ctx1p.Reset();
     isolate->ContextDisposedNotification();
   }
   CcTest::heap()->CollectAllAvailableGarbage();
-  CHECK_EQ(1, NumberOfGlobalObjects());
+  CHECK_EQ(2, NumberOfGlobalObjects());
   ctx2p.Reset();
   CcTest::heap()->CollectAllAvailableGarbage();
   CHECK_EQ(0, NumberOfGlobalObjects());
 }
 
 
 TEST(InstanceOfStubWriteBarrier) {
   i::FLAG_allow_natives_syntax = true;
 #ifdef VERIFY_HEAP
   i::FLAG_verify_heap = true;
@@ skipping 3876 matching lines @@
   isolate->IncrementJsCallsFromApiCounter();
   isolate->IncrementJsCallsFromApiCounter();
   isolate->IncrementJsCallsFromApiCounter();
   calls_per_ms = memory_reducer->SampleAndGetJsCallsPerMs(4);
   CheckDoubleEquals(2, calls_per_ms);
 }
 
 
 }  // namespace internal
 }  // namespace v8