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

test/cctest/test-lockers.cc

 // Copyright 2007-2011 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 51 matching lines @@
                  v8::Handle<v8::Context> context)
       : Thread("KangarooThread"),
         isolate_(isolate), context_(context) {
   }
 
   void Run() {
     {
       v8::Locker locker(isolate_);
       v8::Isolate::Scope isolate_scope(isolate_);
       CHECK_EQ(isolate_, v8::internal::Isolate::Current());
-      v8::HandleScope scope;
+      v8::HandleScope scope(isolate_);
       v8::Context::Scope context_scope(context_);
       Local<Value> v = CompileRun("getValue()");
       CHECK(v->IsNumber());
       CHECK_EQ(30, static_cast<int>(v->NumberValue()));
     }
     {
       v8::Locker locker(isolate_);
       v8::Isolate::Scope isolate_scope(isolate_);
       v8::Context::Scope context_scope(context_);
-      v8::HandleScope scope;
+      v8::HandleScope scope(isolate_);
       Local<Value> v = CompileRun("getValue()");
       CHECK(v->IsNumber());
       CHECK_EQ(30, static_cast<int>(v->NumberValue()));
     }
     isolate_->Dispose();
   }
 
  private:
   v8::Isolate* isolate_;
   Persistent<v8::Context> context_;
 };
 
 // Migrates an isolate from one thread to another
 TEST(KangarooIsolates) {
   v8::Isolate* isolate = v8::Isolate::New();
   Persistent<v8::Context> context;
   {
     v8::Locker locker(isolate);
     v8::Isolate::Scope isolate_scope(isolate);
-    v8::HandleScope handle_scope;
+    v8::HandleScope handle_scope(isolate);
     context = v8::Context::New();
     v8::Context::Scope context_scope(context);
     CHECK_EQ(isolate, v8::internal::Isolate::Current());
     CompileRun("function getValue() { return 30; }");
   }
   KangarooThread thread1(isolate, context);
   thread1.Start();
   thread1.Join();
 }
 
@@ skipping 59 matching lines @@
 class IsolateLockingThreadWithLocalContext : public JoinableThread {
  public:
   explicit IsolateLockingThreadWithLocalContext(v8::Isolate* isolate)
     : JoinableThread("IsolateLockingThread"),
       isolate_(isolate) {
   }
 
   virtual void Run() {
     v8::Locker locker(isolate_);
     v8::Isolate::Scope isolate_scope(isolate_);
-    v8::HandleScope handle_scope;
+    v8::HandleScope handle_scope(isolate_);
     LocalContext local_context;
     CHECK_EQ(isolate_, v8::internal::Isolate::Current());
     CalcFibAndCheck();
   }
  private:
   v8::Isolate* isolate_;
 };
 
 static void StartJoinAndDeleteThreads(const i::List<JoinableThread*>& threads) {
   for (int i = 0; i < threads.length(); i++) {
@@ skipping 27 matching lines @@
 class IsolateNonlockingThread : public JoinableThread {
  public:
   explicit IsolateNonlockingThread()
     : JoinableThread("IsolateNonlockingThread") {
   }
 
   virtual void Run() {
     v8::Isolate* isolate = v8::Isolate::New();
     {
       v8::Isolate::Scope isolate_scope(isolate);
-      v8::HandleScope handle_scope;
+      v8::HandleScope handle_scope(isolate);
       v8::Handle<v8::Context> context = v8::Context::New();
       v8::Context::Scope context_scope(context);
       CHECK_EQ(isolate, v8::internal::Isolate::Current());
       CalcFibAndCheck();
     }
     isolate->Dispose();
   }
  private:
 };
 
@@ skipping 13 matching lines @@
 
 
 class IsolateNestedLockingThread : public JoinableThread {
  public:
   explicit IsolateNestedLockingThread(v8::Isolate* isolate)
     : JoinableThread("IsolateNestedLocking"), isolate_(isolate) {
   }
   virtual void Run() {
     v8::Locker lock(isolate_);
     v8::Isolate::Scope isolate_scope(isolate_);
-    v8::HandleScope handle_scope;
+    v8::HandleScope handle_scope(isolate_);
     LocalContext local_context;
     {
       v8::Locker another_lock(isolate_);
       CalcFibAndCheck();
     }
     {
       v8::Locker another_lock(isolate_);
       CalcFibAndCheck();
     }
   }
@@ skipping 22 matching lines @@
  public:
   SeparateIsolatesLocksNonexclusiveThread(v8::Isolate* isolate1,
                                           v8::Isolate* isolate2)
     : JoinableThread("SeparateIsolatesLocksNonexclusiveThread"),
       isolate1_(isolate1), isolate2_(isolate2) {
   }
 
   virtual void Run() {
     v8::Locker lock(isolate1_);
     v8::Isolate::Scope isolate_scope(isolate1_);
-    v8::HandleScope handle_scope;
+    v8::HandleScope handle_scope(isolate1_);
     LocalContext local_context;
 
     IsolateLockingThreadWithLocalContext threadB(isolate2_);
     threadB.Start();
     CalcFibAndCheck();
     threadB.Join();
   }
  private:
   v8::Isolate* isolate1_;
   v8::Isolate* isolate2_;
@@ skipping 23 matching lines @@
   explicit LockIsolateAndCalculateFibSharedContextThread(
       v8::Isolate* isolate, v8::Handle<v8::Context> context)
     : JoinableThread("LockIsolateAndCalculateFibThread"),
       isolate_(isolate),
       context_(context) {
   }
 
   virtual void Run() {
     v8::Locker lock(isolate_);
     v8::Isolate::Scope isolate_scope(isolate_);
-    HandleScope handle_scope;
+    HandleScope handle_scope(isolate_);
     v8::Context::Scope context_scope(context_);
     CalcFibAndCheck();
   }
  private:
   v8::Isolate* isolate_;
   Persistent<v8::Context> context_;
 };
 
 class LockerUnlockerThread : public JoinableThread {
  public:
   explicit LockerUnlockerThread(v8::Isolate* isolate)
     : JoinableThread("LockerUnlockerThread"),
       isolate_(isolate) {
   }
 
   virtual void Run() {
     v8::Locker lock(isolate_);
     v8::Isolate::Scope isolate_scope(isolate_);
-    v8::HandleScope handle_scope;
+    v8::HandleScope handle_scope(isolate_);
     v8::Handle<v8::Context> context = v8::Context::New();
     {
       v8::Context::Scope context_scope(context);
       CalcFibAndCheck();
     }
     {
       isolate_->Exit();
       v8::Unlocker unlocker(isolate_);
       LockIsolateAndCalculateFibSharedContextThread thread(isolate_, context);
       thread.Start();
@@ skipping 29 matching lines @@
 class LockTwiceAndUnlockThread : public JoinableThread {
  public:
   explicit LockTwiceAndUnlockThread(v8::Isolate* isolate)
     : JoinableThread("LockTwiceAndUnlockThread"),
       isolate_(isolate) {
   }
 
   virtual void Run() {
     v8::Locker lock(isolate_);
     v8::Isolate::Scope isolate_scope(isolate_);
-    v8::HandleScope handle_scope;
+    v8::HandleScope handle_scope(isolate_);
     v8::Handle<v8::Context> context = v8::Context::New();
     {
       v8::Context::Scope context_scope(context);
       CalcFibAndCheck();
     }
     {
       v8::Locker second_lock(isolate_);
       {
         isolate_->Exit();
         v8::Unlocker unlocker(isolate_);
@@ skipping 39 matching lines @@
   }
 
   virtual void Run() {
     Persistent<v8::Context> context1;
     Persistent<v8::Context> context2;
     v8::Locker lock1(isolate1_);
     CHECK(v8::Locker::IsLocked(isolate1_));
     CHECK(!v8::Locker::IsLocked(isolate2_));
     {
       v8::Isolate::Scope isolate_scope(isolate1_);
-      v8::HandleScope handle_scope;
+      v8::HandleScope handle_scope(isolate1_);
       context1 = v8::Context::New();
       {
         v8::Context::Scope context_scope(context1);
         CalcFibAndCheck();
       }
     }
     v8::Locker lock2(isolate2_);
     CHECK(v8::Locker::IsLocked(isolate1_));
     CHECK(v8::Locker::IsLocked(isolate2_));
     {
       v8::Isolate::Scope isolate_scope(isolate2_);
-      v8::HandleScope handle_scope;
+      v8::HandleScope handle_scope(isolate2_);
       context2 = v8::Context::New();
       {
         v8::Context::Scope context_scope(context2);
         CalcFibAndCheck();
       }
     }
     {
       v8::Unlocker unlock1(isolate1_);
       CHECK(!v8::Locker::IsLocked(isolate1_));
       CHECK(v8::Locker::IsLocked(isolate2_));
       v8::Isolate::Scope isolate_scope(isolate2_);
-      v8::HandleScope handle_scope;
+      v8::HandleScope handle_scope(isolate2_);
       v8::Context::Scope context_scope(context2);
       LockIsolateAndCalculateFibSharedContextThread thread(isolate1_, context1);
       thread.Start();
       CalcFibAndCheck();
       thread.Join();
     }
   }
 
  private:
   v8::Isolate* isolate1_;
@@ skipping 18 matching lines @@
       isolate_(isolate),
       context_(context) {
   }
 
   virtual void Run() {
     v8::Locker lock1(isolate_);
     CHECK(v8::Locker::IsLocked(isolate_));
     CHECK(!v8::Locker::IsLocked(CcTest::default_isolate()));
     {
       v8::Isolate::Scope isolate_scope(isolate_);
-      v8::HandleScope handle_scope;
+      v8::HandleScope handle_scope(isolate_);
       v8::Context::Scope context_scope(context_);
       CalcFibAndCheck();
     }
     {
       v8::Unlocker unlock1(isolate_);
       CHECK(!v8::Locker::IsLocked(isolate_));
       CHECK(!v8::Locker::IsLocked(CcTest::default_isolate()));
       {
         v8::Locker lock2(isolate_);
         v8::Isolate::Scope isolate_scope(isolate_);
-        v8::HandleScope handle_scope;
+        v8::HandleScope handle_scope(isolate_);
         CHECK(v8::Locker::IsLocked(isolate_));
         CHECK(!v8::Locker::IsLocked(CcTest::default_isolate()));
         v8::Context::Scope context_scope(context_);
         CalcFibAndCheck();
       }
     }
   }
 
  private:
   v8::Isolate* isolate_;
   v8::Persistent<v8::Context> context_;
 };
 
 // Locker inside an Unlocker inside a Locker.
 TEST(LockUnlockLockMultithreaded) {
 #ifdef V8_TARGET_ARCH_MIPS
   const int kNThreads = 50;
 #else
   const int kNThreads = 100;
 #endif
   v8::Isolate* isolate = v8::Isolate::New();
   Persistent<v8::Context> context;
   {
     v8::Locker locker_(isolate);
     v8::Isolate::Scope isolate_scope(isolate);
-    v8::HandleScope handle_scope;
+    v8::HandleScope handle_scope(isolate);
     context = v8::Context::New();
   }
   i::List<JoinableThread*> threads(kNThreads);
   for (int i = 0; i < kNThreads; i++) {
     threads.Add(new LockUnlockLockThread(isolate, context));
   }
   StartJoinAndDeleteThreads(threads);
   isolate->Dispose();
 }
 
 class LockUnlockLockDefaultIsolateThread : public JoinableThread {
  public:
   explicit LockUnlockLockDefaultIsolateThread(v8::Handle<v8::Context> context)
     : JoinableThread("LockUnlockLockDefaultIsolateThread"),
       context_(context) {
   }
 
   virtual void Run() {
     v8::Locker lock1(CcTest::default_isolate());
     {
-      v8::HandleScope handle_scope;
+      v8::HandleScope handle_scope(CcTest::default_isolate());
       v8::Context::Scope context_scope(context_);
       CalcFibAndCheck();
     }
     {
       v8::Unlocker unlock1(CcTest::default_isolate());
       {
         v8::Locker lock2(CcTest::default_isolate());
-        v8::HandleScope handle_scope;
+        v8::HandleScope handle_scope(CcTest::default_isolate());
         v8::Context::Scope context_scope(context_);
         CalcFibAndCheck();
       }
     }
   }
 
  private:
   v8::Persistent<v8::Context> context_;
 };
 
 // Locker inside an Unlocker inside a Locker for default isolate.
 TEST(LockUnlockLockDefaultIsolateMultithreaded) {
 #ifdef V8_TARGET_ARCH_MIPS
   const int kNThreads = 50;
 #else
   const int kNThreads = 100;
 #endif
   Persistent<v8::Context> context;
   {
     v8::Locker locker_(CcTest::default_isolate());
-    v8::HandleScope handle_scope;
+    v8::HandleScope handle_scope(CcTest::default_isolate());
     context = v8::Context::New();
   }
   i::List<JoinableThread*> threads(kNThreads);
   for (int i = 0; i < kNThreads; i++) {
     threads.Add(new LockUnlockLockDefaultIsolateThread(context));
   }
   StartJoinAndDeleteThreads(threads);
 }
 
 
 TEST(Regress1433) {
   for (int i = 0; i < 10; i++) {
     v8::Isolate* isolate = v8::Isolate::New();
     {
       v8::Locker lock(isolate);
       v8::Isolate::Scope isolate_scope(isolate);
-      v8::HandleScope handle_scope;
+      v8::HandleScope handle_scope(isolate);
       v8::Persistent<Context> context = v8::Context::New();
       v8::Context::Scope context_scope(context);
       v8::Handle<String> source = v8::String::New("1+1");
       v8::Handle<Script> script = v8::Script::Compile(source);
       v8::Handle<Value> result = script->Run();
       v8::String::AsciiValue ascii(result);
       context.Dispose(isolate);
     }
     isolate->Dispose();
   }
@@ skipping 56 matching lines @@
                                           kSimpleExtensionSource));
   const char* extension_names[] = { "test0", "test1",
                                     "test2", "test3", "test4",
                                     "test5", "test6", "test7" };
   i::List<JoinableThread*> threads(kNThreads);
   for (int i = 0; i < kNThreads; i++) {
     threads.Add(new IsolateGenesisThread(8, extension_names));
   }
   StartJoinAndDeleteThreads(threads);
 }