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

test/cctest/test-decls.cc

 // Copyright 2007-2008 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 95 matching lines @@
 
 
 DeclarationContext::DeclarationContext()
     : is_initialized_(false), get_count_(0), set_count_(0), query_count_(0) {
   // Do nothing.
 }
 
 
 void DeclarationContext::InitializeIfNeeded() {
   if (is_initialized_) return;
-  HandleScope scope;
+  HandleScope scope(Isolate::GetCurrent());
   Local<FunctionTemplate> function = FunctionTemplate::New();
   Local<Value> data = External::New(this);
   GetHolder(function)->SetNamedPropertyHandler(&HandleGet,
                                                &HandleSet,
                                                &HandleQuery,
                                                0, 0,
                                                data);
   context_ = Context::New(0, function->InstanceTemplate(), Local<Value>());
   context_->Enter();
   is_initialized_ = true;
   PostInitializeContext(context_);
 }
 
 
 void DeclarationContext::Check(const char* source,
                                int get, int set, int query,
                                Expectations expectations,
                                v8::Handle<Value> value) {
   InitializeIfNeeded();
   // A retry after a GC may pollute the counts, so perform gc now
   // to avoid that.
   HEAP->CollectGarbage(v8::internal::NEW_SPACE);
-  HandleScope scope;
+  HandleScope scope(Isolate::GetCurrent());
   TryCatch catcher;
   catcher.SetVerbose(true);
   Local<Script> script = Script::Compile(String::New(source));
   if (expectations == EXPECT_ERROR) {
     CHECK(script.IsEmpty());
     return;
   }
   CHECK(!script.IsEmpty());
   Local<Value> result = script->Run();
   CHECK_EQ(get, get_count());
@@ skipping 58 matching lines @@
 
 
 v8::Handle<Integer> DeclarationContext::Query(Local<String> key) {
   return v8::Handle<Integer>();
 }
 
 
 // Test global declaration of a property the interceptor doesn't know
 // about and doesn't handle.
 TEST(Unknown) {
-  HandleScope scope;
+  HandleScope scope(Isolate::GetCurrent());
 
   { DeclarationContext context;
     context.Check("var x; x",
                   1,  // access
                   1,  // declaration
                   2,  // declaration + initialization
                   EXPECT_RESULT, Undefined());
   }
 
   { DeclarationContext context;
@@ skipping 34 matching lines @@
 class PresentPropertyContext: public DeclarationContext {
  protected:
   virtual v8::Handle<Integer> Query(Local<String> key) {
     return Integer::New(v8::None);
   }
 };
 
 
 
 TEST(Present) {
-  HandleScope scope;
+  HandleScope scope(Isolate::GetCurrent());
 
   { PresentPropertyContext context;
     context.Check("var x; x",
                   1,  // access
                   0,
                   2,  // declaration + initialization
                   EXPECT_EXCEPTION);  // x is not defined!
   }
 
   { PresentPropertyContext context;
@@ skipping 33 matching lines @@
 
 class AbsentPropertyContext: public DeclarationContext {
  protected:
   virtual v8::Handle<Integer> Query(Local<String> key) {
     return v8::Handle<Integer>();
   }
 };
 
 
 TEST(Absent) {
-  HandleScope scope;
+  HandleScope scope(Isolate::GetCurrent());
 
   { AbsentPropertyContext context;
     context.Check("var x; x",
                   1,  // access
                   1,  // declaration
                   2,  // declaration + initialization
                   EXPECT_RESULT, Undefined());
   }
 
   { AbsentPropertyContext context;
@@ skipping 69 matching lines @@
     // Do the lookup in the object.
     return v8::Handle<Integer>();
   }
 
  private:
   State state_;
 };
 
 
 TEST(Appearing) {
-  HandleScope scope;
+  HandleScope scope(Isolate::GetCurrent());
 
   { AppearingPropertyContext context;
     context.Check("var x; x",
                   1,  // access
                   1,  // declaration
                   2,  // declaration + initialization
                   EXPECT_RESULT, Undefined());
   }
 
   { AppearingPropertyContext context;
@@ skipping 71 matching lines @@
     // Do the lookup in the object.
     return Handle<Integer>();
   }
 
  private:
   State state_;
 };
 
 
 TEST(Reappearing) {
-  HandleScope scope;
+  HandleScope scope(Isolate::GetCurrent());
 
   { ReappearingPropertyContext context;
     context.Check("const x; var x = 0",
                   0,
                   3,  // const declaration+initialization, var initialization
                   3,  // 2 x declaration + var initialization
                   EXPECT_RESULT, Undefined());
   }
 }
 
 
 
 class ExistsInPrototypeContext: public DeclarationContext {
  protected:
   virtual v8::Handle<Integer> Query(Local<String> key) {
     // Let it seem that the property exists in the prototype object.
     return Integer::New(v8::None);
   }
 
   // Use the prototype as the holder for the interceptors.
   virtual Local<ObjectTemplate> GetHolder(Local<FunctionTemplate> function) {
     return function->PrototypeTemplate();
   }
 };
 
 
 TEST(ExistsInPrototype) {
   i::FLAG_es52_globals = true;
-  HandleScope scope;
+  HandleScope scope(Isolate::GetCurrent());
 
   // Sanity check to make sure that the holder of the interceptor
   // really is the prototype object.
   { ExistsInPrototypeContext context;
     context.Check("this.x = 87; this.x",
                   0,
                   0,
                   0,
                   EXPECT_RESULT, Number::New(87));
   }
@@ skipping 42 matching lines @@
 
   // Use the prototype as the holder for the interceptors.
   virtual Local<ObjectTemplate> GetHolder(Local<FunctionTemplate> function) {
     return function->PrototypeTemplate();
   }
 };
 
 
 TEST(AbsentInPrototype) {
   i::FLAG_es52_globals = true;
-  HandleScope scope;
+  HandleScope scope(Isolate::GetCurrent());
 
   { AbsentInPrototypeContext context;
     context.Check("if (false) { var x = 0; }; x",
                   0,
                   0,
                   0,
                   EXPECT_RESULT, Undefined());
   }
 }
 
@@ skipping 26 matching lines @@
     return hidden_proto_->InstanceTemplate();
   }
 
  private:
   Local<FunctionTemplate> hidden_proto_;
 };
 
 
 TEST(ExistsInHiddenPrototype) {
   i::FLAG_es52_globals = true;
-  HandleScope scope;
+  HandleScope scope(Isolate::GetCurrent());
 
   { ExistsInHiddenPrototypeContext context;
     context.Check("var x; x",
                   1,  // access
                   0,
                   2,  // declaration + initialization
                   EXPECT_EXCEPTION);  // x is not defined!
   }
 
   { ExistsInHiddenPrototypeContext context;
@@ skipping 41 matching lines @@
   }
 
   virtual ~SimpleContext() {
     context_->Exit();
     context_.Dispose(context_->GetIsolate());
   }
 
   void Check(const char* source,
              Expectations expectations,
              v8::Handle<Value> value = Local<Value>()) {
-    HandleScope scope;
+    HandleScope scope(context_->GetIsolate());
     TryCatch catcher;
     catcher.SetVerbose(true);
     Local<Script> script = Script::Compile(String::New(source));
     if (expectations == EXPECT_ERROR) {
       CHECK(script.IsEmpty());
       return;
     }
     CHECK(!script.IsEmpty());
     Local<Value> result = script->Run();
     if (expectations == EXPECT_RESULT) {
       CHECK(!catcher.HasCaught());
       if (!value.IsEmpty()) {
         CHECK_EQ(value, result);
       }
     } else {
       CHECK(expectations == EXPECT_EXCEPTION);
       CHECK(catcher.HasCaught());
       if (!value.IsEmpty()) {
         CHECK_EQ(value, catcher.Exception());
       }
     }
   }
 
  private:
   Persistent<Context> context_;
 };
 
 
 TEST(CrossScriptReferences) {
-  HandleScope scope;
+  HandleScope scope(Isolate::GetCurrent());
 
   { SimpleContext context;
     context.Check("var x = 1; x",
                   EXPECT_RESULT, Number::New(1));
     context.Check("var x = 2; x",
                   EXPECT_RESULT, Number::New(2));
     context.Check("const x = 3; x",
                   EXPECT_RESULT, Number::New(3));
     context.Check("const x = 4; x",
                   EXPECT_RESULT, Number::New(4));
@@ skipping 24 matching lines @@
                   EXPECT_EXCEPTION);
   }
 }
 
 
 TEST(CrossScriptReferencesHarmony) {
   i::FLAG_use_strict = true;
   i::FLAG_harmony_scoping = true;
   i::FLAG_harmony_modules = true;
 
-  HandleScope scope;
+  HandleScope scope(Isolate::GetCurrent());
 
   const char* decs[] = {
     "var x = 1; x", "x", "this.x",
     "function x() { return 1 }; x()", "x()", "this.x()",
     "let x = 1; x", "x", "this.x",
     "const x = 1; x", "x", "this.x",
     "module x { export let a = 1 }; x.a", "x.a", "this.x.a",
     NULL
   };
 
   for (int i = 0; decs[i] != NULL; i += 3) {
     SimpleContext context;
     context.Check(decs[i], EXPECT_RESULT, Number::New(1));
     context.Check(decs[i+1], EXPECT_RESULT, Number::New(1));
     // TODO(rossberg): The current ES6 draft spec does not reflect lexical
     // bindings on the global object. However, this will probably change, in
     // which case we reactivate the following test.
     if (i/3 < 2) context.Check(decs[i+2], EXPECT_RESULT, Number::New(1));
   }
 }
 
 
 TEST(CrossScriptConflicts) {
   i::FLAG_use_strict = true;
   i::FLAG_harmony_scoping = true;
   i::FLAG_harmony_modules = true;
 
-  HandleScope scope;
+  HandleScope scope(Isolate::GetCurrent());
 
   const char* firsts[] = {
     "var x = 1; x",
     "function x() { return 1 }; x()",
     "let x = 1; x",
     "const x = 1; x",
     "module x { export let a = 1 }; x.a",
     NULL
   };
   const char* seconds[] = {
@@ skipping 10 matching lines @@
       SimpleContext context;
       context.Check(firsts[i], EXPECT_RESULT, Number::New(1));
       // TODO(rossberg): All tests should actually be errors in Harmony,
       // but we currently do not detect the cases where the first declaration
       // is not lexical.
       context.Check(seconds[j],
                     i < 2 ? EXPECT_RESULT : EXPECT_ERROR, Number::New(2));
     }
   }
 }