test/cctest/test-api.cc - Issue 12729023: first step to remove unsafe handles

Unified Diff: test/cctest/test-api.cc

Issue 12729023: first step to remove unsafe handles (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge

Patch Set: 1 month rebase Created 7 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: test/cctest/test-api.cc

diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc

index 9d05c0f795a55dc23fb0fe2ad780d90db863adc3..6ff84bbb35ae2361e999807e28fbc23582c50034 100644

--- a/test/cctest/test-api.cc

+++ b/test/cctest/test-api.cc

@@ -32,6 +32,11 @@

#include <unistd.h> // getpid

#endif // WIN32

+// TODO(dcarney): remove

+#define V8_ALLOW_ACCESS_TO_RAW_HANDLE_CONSTRUCTOR

+#define V8_ALLOW_ACCESS_TO_PERSISTENT_IMPLICIT

+#define V8_ALLOW_ACCESS_TO_PERSISTENT_ARROW

#include "v8.h"

#include "api.h"

@@ -161,8 +166,8 @@ THREADED_TEST(Handles) {

THREADED_TEST(IsolateOfContext) {

- v8::Persistent<Context> env = Context::New();

- v8::HandleScope scope(env->GetIsolate());

+ v8::HandleScope scope(v8::Isolate::GetCurrent());

+ v8::Handle<Context> env = Context::New(v8::Isolate::GetCurrent());

CHECK(!env->InContext());

CHECK(env->GetIsolate() == v8::Isolate::GetCurrent());

@@ -172,8 +177,6 @@ THREADED_TEST(IsolateOfContext) {

env->Exit();

CHECK(!env->InContext());

CHECK(env->GetIsolate() == v8::Isolate::GetCurrent());

- env.Dispose(env->GetIsolate());

}

@@ -2479,8 +2482,8 @@ THREADED_TEST(ApiObjectGroups) {

Persistent<Object> root = Persistent<Object>::New(iso, g1s1); // make a root.

// Connect group 1 and 2, make a cycle.

- CHECK(g1s2->Set(0, g2s2));

- CHECK(g2s1->Set(0, g1s1));

+ CHECK(g1s2->Set(0, Handle<Object>(*g2s2)));

+ CHECK(g2s1->Set(0, Handle<Object>(*g1s1)));

{

Persistent<Value> g1_objects[] = { g1s1, g1s2 };

@@ -2691,11 +2694,11 @@ TEST(ApiObjectGroupsCycleForScavenger) {

Persistent<Value> g2_objects[] = { g2s1, g2s2 };

Persistent<Value> g3_objects[] = { g3s1, g3s2 };

V8::AddObjectGroup(g1_objects, 2);

- g1s1->Set(v8_str("x"), g2s1);

+ g1s1->Set(v8_str("x"), Handle<Object>(*g2s1));

V8::AddObjectGroup(g2_objects, 2);

- g2s1->Set(v8_str("x"), g3s1);

+ g2s1->Set(v8_str("x"), Handle<Object>(*g3s1));

V8::AddObjectGroup(g3_objects, 2);

- g3s1->Set(v8_str("x"), g1s1);

+ g3s1->Set(v8_str("x"), Handle<Object>(*g1s1));

}

HEAP->CollectGarbage(i::NEW_SPACE);

@@ -2720,11 +2723,11 @@ TEST(ApiObjectGroupsCycleForScavenger) {

Persistent<Value> g2_objects[] = { g2s1, g2s2 };

Persistent<Value> g3_objects[] = { g3s1, g3s2 };

V8::AddObjectGroup(g1_objects, 2);

- g1s1->Set(v8_str("x"), g2s1);

+ g1s1->Set(v8_str("x"), Handle<Object>(*g2s1));

V8::AddObjectGroup(g2_objects, 2);

- g2s1->Set(v8_str("x"), g3s1);

+ g2s1->Set(v8_str("x"), Handle<Object>(*g3s1));

V8::AddObjectGroup(g3_objects, 2);

- g3s1->Set(v8_str("x"), g1s1);

+ g3s1->Set(v8_str("x"), Handle<Object>(*g1s1));

}

HEAP->CollectGarbage(i::NEW_SPACE);

@@ -4178,7 +4181,7 @@ THREADED_TEST(SimplePropertyWrite) {

for (int i = 0; i < 10; i++) {

CHECK(xValue.IsEmpty());

script->Run();

- CHECK_EQ(v8_num(4), xValue);

+ CHECK_EQ(v8_num(4), Handle<Value>(*xValue));

xValue.Dispose(context->GetIsolate());

xValue = v8::Persistent<Value>();

}

@@ -4195,7 +4198,7 @@ THREADED_TEST(SetterOnly) {

for (int i = 0; i < 10; i++) {

CHECK(xValue.IsEmpty());

script->Run();

- CHECK_EQ(v8_num(4), xValue);

+ CHECK_EQ(v8_num(4), Handle<Value>(*xValue));

xValue.Dispose(context->GetIsolate());

xValue = v8::Persistent<Value>();

}

@@ -5086,7 +5089,7 @@ THREADED_TEST(GlobalObjectTemplate) {

global_template->Set(v8_str("JSNI_Log"),

v8::FunctionTemplate::New(HandleLogDelegator));

v8::Persistent<Context> context = Context::New(0, global_template);

- Context::Scope context_scope(context);

+ Context::Scope context_scope(v8::Isolate::GetCurrent(), context);

Script::Compile(v8_str("JSNI_Log('LOG')"))->Run();

context.Dispose(context->GetIsolate());

}

@@ -5103,7 +5106,8 @@ THREADED_TEST(SimpleExtensions) {

v8::RegisterExtension(new Extension("simpletest", kSimpleExtensionSource));

const char* extension_names[] = { "simpletest" };

v8::ExtensionConfiguration extensions(1, extension_names);

- v8::Handle<Context> context = Context::New(&extensions);

+ v8::Handle<Context> context =

+ Context::New(v8::Isolate::GetCurrent(), &extensions);

Context::Scope lock(context);

v8::Handle<Value> result = Script::Compile(v8_str("Foo()"))->Run();

CHECK_EQ(result, v8::Integer::New(4));

@@ -5115,7 +5119,8 @@ THREADED_TEST(NullExtensions) {

v8::RegisterExtension(new Extension("nulltest", NULL));

const char* extension_names[] = { "nulltest" };

v8::ExtensionConfiguration extensions(1, extension_names);

- v8::Handle<Context> context = Context::New(&extensions);

+ v8::Handle<Context> context =

+ Context::New(v8::Isolate::GetCurrent(), &extensions);

Context::Scope lock(context);

v8::Handle<Value> result = Script::Compile(v8_str("1+3"))->Run();

CHECK_EQ(result, v8::Integer::New(4));

@@ -5134,7 +5139,8 @@ THREADED_TEST(ExtensionMissingSourceLength) {

kEmbeddedExtensionSource));

const char* extension_names[] = { "srclentest_fail" };

v8::ExtensionConfiguration extensions(1, extension_names);

- v8::Handle<Context> context = Context::New(&extensions);

+ v8::Handle<Context> context =

+ Context::New(v8::Isolate::GetCurrent(), &extensions);

CHECK_EQ(0, *context);

}

@@ -5150,7 +5156,8 @@ THREADED_TEST(ExtensionWithSourceLength) {

source_len));

const char* extension_names[1] = { extension_name.start() };

v8::ExtensionConfiguration extensions(1, extension_names);

- v8::Handle<Context> context = Context::New(&extensions);

+ v8::Handle<Context> context =

+ Context::New(v8::Isolate::GetCurrent(), &extensions);

if (source_len == kEmbeddedExtensionSourceValidLen) {

Context::Scope lock(context);

v8::Handle<Value> result = Script::Compile(v8_str("Ret54321()"))->Run();

@@ -5186,7 +5193,8 @@ THREADED_TEST(UseEvalFromExtension) {

v8::RegisterExtension(new Extension("evaltest2", kEvalExtensionSource2));

const char* extension_names[] = { "evaltest1", "evaltest2" };

v8::ExtensionConfiguration extensions(2, extension_names);

- v8::Handle<Context> context = Context::New(&extensions);

+ v8::Handle<Context> context =

+ Context::New(v8::Isolate::GetCurrent(), &extensions);

Context::Scope lock(context);

v8::Handle<Value> result = Script::Compile(v8_str("UseEval1()"))->Run();

CHECK_EQ(result, v8::Integer::New(42));

@@ -5219,7 +5227,8 @@ THREADED_TEST(UseWithFromExtension) {

v8::RegisterExtension(new Extension("withtest2", kWithExtensionSource2));

const char* extension_names[] = { "withtest1", "withtest2" };

v8::ExtensionConfiguration extensions(2, extension_names);

- v8::Handle<Context> context = Context::New(&extensions);

+ v8::Handle<Context> context =

+ Context::New(v8::Isolate::GetCurrent(), &extensions);

Context::Scope lock(context);

v8::Handle<Value> result = Script::Compile(v8_str("UseWith1()"))->Run();

CHECK_EQ(result, v8::Integer::New(87));

@@ -5233,7 +5242,8 @@ THREADED_TEST(AutoExtensions) {

Extension* extension = new Extension("autotest", kSimpleExtensionSource);

extension->set_auto_enable(true);

v8::RegisterExtension(extension);

- v8::Handle<Context> context = Context::New();

+ v8::Handle<Context> context =

+ Context::New(v8::Isolate::GetCurrent());

Context::Scope lock(context);

v8::Handle<Value> result = Script::Compile(v8_str("Foo()"))->Run();

CHECK_EQ(result, v8::Integer::New(4));

@@ -5252,7 +5262,8 @@ THREADED_TEST(SyntaxErrorExtensions) {

kSyntaxErrorInExtensionSource));

const char* extension_names[] = { "syntaxerror" };

v8::ExtensionConfiguration extensions(1, extension_names);

- v8::Handle<Context> context = Context::New(&extensions);

+ v8::Handle<Context> context =

+ Context::New(v8::Isolate::GetCurrent(), &extensions);

CHECK(context.IsEmpty());

}

@@ -5269,7 +5280,8 @@ THREADED_TEST(ExceptionExtensions) {

kExceptionInExtensionSource));

const char* extension_names[] = { "exception" };

v8::ExtensionConfiguration extensions(1, extension_names);

- v8::Handle<Context> context = Context::New(&extensions);

+ v8::Handle<Context> context =

+ Context::New(v8::Isolate::GetCurrent(), &extensions);

CHECK(context.IsEmpty());

}

@@ -5290,7 +5302,8 @@ THREADED_TEST(NativeCallInExtensions) {

kNativeCallInExtensionSource));

const char* extension_names[] = { "nativecall" };

v8::ExtensionConfiguration extensions(1, extension_names);

- v8::Handle<Context> context = Context::New(&extensions);

+ v8::Handle<Context> context =

+ Context::New(v8::Isolate::GetCurrent(), &extensions);

Context::Scope lock(context);

v8::Handle<Value> result = Script::Compile(v8_str(kNativeCallTest))->Run();

CHECK_EQ(result, v8::Integer::New(3));

@@ -5326,7 +5339,8 @@ THREADED_TEST(NativeFunctionDeclaration) {

"native function foo();"));

const char* extension_names[] = { name };

v8::ExtensionConfiguration extensions(1, extension_names);

- v8::Handle<Context> context = Context::New(&extensions);

+ v8::Handle<Context> context =

+ Context::New(v8::Isolate::GetCurrent(), &extensions);

Context::Scope lock(context);

v8::Handle<Value> result = Script::Compile(v8_str("foo(42);"))->Run();

CHECK_EQ(result, v8::Integer::New(42));

@@ -5341,7 +5355,8 @@ THREADED_TEST(NativeFunctionDeclarationError) {

"native\nfunction foo();"));

const char* extension_names[] = { name };

v8::ExtensionConfiguration extensions(1, extension_names);

- v8::Handle<Context> context(Context::New(&extensions));

+ v8::Handle<Context> context =

+ Context::New(v8::Isolate::GetCurrent(), &extensions);

CHECK(context.IsEmpty());

}

@@ -5356,7 +5371,8 @@ THREADED_TEST(NativeFunctionDeclarationErrorEscape) {

"nativ\\u0065 function foo();"));

const char* extension_names[] = { name };

v8::ExtensionConfiguration extensions(1, extension_names);

- v8::Handle<Context> context(Context::New(&extensions));

+ v8::Handle<Context> context =

+ Context::New(v8::Isolate::GetCurrent(), &extensions);

CHECK(context.IsEmpty());

}

@@ -5496,7 +5512,8 @@ TEST(ErrorReporting) {

v8::RegisterExtension(new Extension("B", "", 1, bDeps));

last_location = NULL;

v8::ExtensionConfiguration config(1, bDeps);

- v8::Handle<Context> context = Context::New(&config);

+ v8::Handle<Context> context =

+ Context::New(v8::Isolate::GetCurrent(), &config);

CHECK(context.IsEmpty());

CHECK_NE(last_location, NULL);

}

@@ -5612,7 +5629,8 @@ THREADED_TEST(WeakReference) {

v8::External::New(whammy));

const char* extension_list[] = { "v8/gc" };

v8::ExtensionConfiguration extensions(1, extension_list);

- v8::Persistent<Context> context = Context::New(&extensions);

+ v8::Handle<Context> context =

+ Context::New(v8::Isolate::GetCurrent(), &extensions);

Context::Scope context_scope(context);

v8::Handle<v8::Object> interceptor = templ->NewInstance();

@@ -5629,7 +5647,6 @@ THREADED_TEST(WeakReference) {

v8::Handle<Value> result = CompileRun(code);

CHECK_EQ(4.0, result->NumberValue());

delete whammy;

- context.Dispose(context->GetIsolate());

}

@@ -5643,8 +5660,9 @@ static void DisposeAndSetFlag(v8::Isolate* isolate,

THREADED_TEST(IndependentWeakHandle) {

- v8::Persistent<Context> context = Context::New();

- v8::Isolate* iso = context->GetIsolate();

+ v8::Isolate* iso = v8::Isolate::GetCurrent();

+ v8::HandleScope scope(iso);

+ v8::Handle<Context> context = Context::New(iso);

Context::Scope context_scope(context);

v8::Persistent<v8::Object> object_a, object_b;

@@ -5700,8 +5718,9 @@ static void ForceMarkSweep(v8::Isolate* isolate,

THREADED_TEST(GCFromWeakCallbacks) {

- v8::Persistent<Context> context = Context::New();

- v8::Isolate* isolate = context->GetIsolate();

+ v8::Isolate* isolate = v8::Isolate::GetCurrent();

+ v8::HandleScope scope(isolate);

+ v8::Handle<Context> context = Context::New(isolate);

Context::Scope context_scope(context);

static const int kNumberOfGCTypes = 2;

@@ -5737,9 +5756,10 @@ static void RevivingCallback(v8::Isolate* isolate,

THREADED_TEST(IndependentHandleRevival) {

- v8::Persistent<Context> context = Context::New();

+ v8::Isolate* isolate = v8::Isolate::GetCurrent();

+ v8::HandleScope scope(isolate);

+ v8::Handle<Context> context = Context::New(isolate);

Context::Scope context_scope(context);

- v8::Isolate* isolate = context->GetIsolate();

v8::Persistent<v8::Object> object;

{

@@ -6794,8 +6814,8 @@ TEST(SecurityHandler) {

global_template->SetAccessCheckCallbacks(NamedSecurityTestCallback,

IndexedSecurityTestCallback);

// Create an environment

- v8::Persistent<Context> context0 =

- Context::New(NULL, global_template);

+ v8::Handle<Context> context0 =

+ Context::New(v8::Isolate::GetCurrent(), NULL, global_template);

context0->Enter();

v8::Handle<v8::Object> global0 = context0->Global();

@@ -6810,8 +6830,8 @@ TEST(SecurityHandler) {

// Create another environment, should fail security checks.

v8::HandleScope scope1(v8::Isolate::GetCurrent());

- v8::Persistent<Context> context1 =

- Context::New(NULL, global_template);

+ v8::Handle<Context> context1 =

+ Context::New(v8::Isolate::GetCurrent(), NULL, global_template);

context1->Enter();

v8::Handle<v8::Object> global1 = context1->Global();

@@ -6843,17 +6863,14 @@ TEST(SecurityHandler) {

}

context1->Exit();

- context1.Dispose(context1->GetIsolate());

context0->Exit();

- context0.Dispose(context0->GetIsolate());

}

THREADED_TEST(SecurityChecks) {

LocalContext env1;

v8::HandleScope handle_scope(env1->GetIsolate());

- v8::Persistent<Context> env2 = Context::New();

+ v8::Handle<Context> env2 = Context::New(env1->GetIsolate());

Local<Value> foo = v8_str("foo");

Local<Value> bar = v8_str("bar");

@@ -6889,8 +6906,6 @@ THREADED_TEST(SecurityChecks) {

Function::Cast(*spy2)->Call(env2->Global(), 0, NULL);

CHECK(try_catch.HasCaught());

}

- env2.Dispose(env2->GetIsolate());

}

@@ -6898,7 +6913,7 @@ THREADED_TEST(SecurityChecks) {

THREADED_TEST(SecurityChecksForPrototypeChain) {

LocalContext current;

v8::HandleScope scope(current->GetIsolate());

- v8::Persistent<Context> other = Context::New();

+ v8::Handle<Context> other = Context::New(current->GetIsolate());

// Change context to be able to get to the Object function in the

// other context without hitting the security checks.

@@ -6959,14 +6974,13 @@ THREADED_TEST(SecurityChecksForPrototypeChain) {

CHECK(!access_f3->Run()->Equals(v8_num(101)));

CHECK(access_f3->Run()->IsUndefined());

}

- other.Dispose(other->GetIsolate());

}

THREADED_TEST(CrossDomainDelete) {

LocalContext env1;

v8::HandleScope handle_scope(env1->GetIsolate());

- v8::Persistent<Context> env2 = Context::New();

+ v8::Handle<Context> env2 = Context::New(env1->GetIsolate());

Local<Value> foo = v8_str("foo");

Local<Value> bar = v8_str("bar");

@@ -6991,15 +7005,13 @@ THREADED_TEST(CrossDomainDelete) {

Local<Value> v = env1->Global()->Get(v8_str("prop"));

CHECK(v->IsNumber());

CHECK_EQ(3, v->Int32Value());

- env2.Dispose(env2->GetIsolate());

}

THREADED_TEST(CrossDomainIsPropertyEnumerable) {

LocalContext env1;

v8::HandleScope handle_scope(env1->GetIsolate());

- v8::Persistent<Context> env2 = Context::New();

+ v8::Handle<Context> env2 = Context::New(env1->GetIsolate());

Local<Value> foo = v8_str("foo");

Local<Value> bar = v8_str("bar");

@@ -7026,15 +7038,13 @@ THREADED_TEST(CrossDomainIsPropertyEnumerable) {

Local<Value> result = Script::Compile(test)->Run();

CHECK(result->IsFalse());

}

- env2.Dispose(env2->GetIsolate());

}

THREADED_TEST(CrossDomainForIn) {

LocalContext env1;

v8::HandleScope handle_scope(env1->GetIsolate());

- v8::Persistent<Context> env2 = Context::New();

+ v8::Handle<Context> env2 = Context::New(env1->GetIsolate());

Local<Value> foo = v8_str("foo");

Local<Value> bar = v8_str("bar");

@@ -7060,14 +7070,13 @@ THREADED_TEST(CrossDomainForIn) {

"return true;})()");

CHECK(result->IsTrue());

}

- env2.Dispose(env2->GetIsolate());

}

TEST(ContextDetachGlobal) {

LocalContext env1;

v8::HandleScope handle_scope(env1->GetIsolate());

- v8::Persistent<Context> env2 = Context::New();

+ v8::Handle<Context> env2 = Context::New(env1->GetIsolate());

Local<v8::Object> global1 = env1->Global();

@@ -7094,8 +7103,10 @@ TEST(ContextDetachGlobal) {

// env2 has a new global object.

CHECK(!env2->Global()->Equals(global2));

- v8::Persistent<Context> env3 =

- Context::New(0, v8::Handle<v8::ObjectTemplate>(), global2);

+ v8::Handle<Context> env3 = Context::New(env1->GetIsolate(),

+ 0,

+ v8::Handle<v8::ObjectTemplate>(),

+ global2);

env3->SetSecurityToken(v8_str("bar"));

env3->Enter();

@@ -7122,9 +7133,6 @@ TEST(ContextDetachGlobal) {

Local<Value> r = global3->Get(v8_str("prop2"));

CHECK(r->IsUndefined());

}

- env2.Dispose(env2->GetIsolate());

- env3.Dispose(env3->GetIsolate());

}

@@ -7133,7 +7141,7 @@ TEST(DetachAndReattachGlobal) {

v8::HandleScope scope(env1->GetIsolate());

// Create second environment.

- v8::Persistent<Context> env2 = Context::New();

+ v8::Handle<Context> env2 = Context::New(env1->GetIsolate());

Local<Value> foo = v8_str("foo");

@@ -7165,8 +7173,10 @@ TEST(DetachAndReattachGlobal) {

CHECK(result->IsUndefined());

// Reuse global2 for env3.

- v8::Persistent<Context> env3 =

- Context::New(0, v8::Handle<v8::ObjectTemplate>(), global2);

+ v8::Handle<Context> env3 = Context::New(env1->GetIsolate(),

+ 0,

+ v8::Handle<v8::ObjectTemplate>(),

+ global2);

CHECK_EQ(global2, env3->Global());

// Start by using the same security token for env3 as for env1 and env2.

@@ -7201,9 +7211,6 @@ TEST(DetachAndReattachGlobal) {

result = CompileRun("other.p");

CHECK(result->IsInt32());

CHECK_EQ(42, result->Int32Value());

- env2.Dispose(env2->GetIsolate());

- env3.Dispose(env3->GetIsolate());

}

@@ -9272,7 +9279,7 @@ static v8::Handle<Value> InterceptorLoadXICGetter(Local<String> name,

const AccessorInfo& info) {

ApiTestFuzzer::Fuzz();

return v8_str("x")->Equals(name)

- ? v8::Integer::New(42) : v8::Handle<v8::Value>();

+ ? v8::Handle<v8::Value>(v8::Integer::New(42)) : v8::Handle<v8::Value>();

}

@@ -12289,7 +12296,7 @@ THREADED_TEST(TurnOnAccessCheck) {

v8::Handle<v8::Value>(),

false);

v8::Persistent<Context> context = Context::New(NULL, global_template);

- Context::Scope context_scope(context);

+ Context::Scope context_scope(v8::Isolate::GetCurrent(), context);

// Set up a property and a number of functions.

context->Global()->Set(v8_str("a"), v8_num(1));

@@ -12370,7 +12377,7 @@ THREADED_TEST(TurnOnAccessCheckAndRecompile) {

v8::Handle<v8::Value>(),

false);

v8::Persistent<Context> context = Context::New(NULL, global_template);

- Context::Scope context_scope(context);

+ Context::Scope context_scope(v8::Isolate::GetCurrent(), context);

// Set up a property and a number of functions.

context->Global()->Set(v8_str("a"), v8_num(1));

@@ -16389,8 +16396,8 @@ TEST(RunTwoIsolatesOnSingleThread) {

v8::Persistent<v8::Context> context1 = v8::Context::New();

{

- v8::Context::Scope cscope(context1);

v8::HandleScope scope(isolate1);

+ v8::Context::Scope cscope(isolate1, context1);

// Run something in new isolate.

CompileRun("var foo = 'isolate 1';");

ExpectString("function f() { return foo; }; f()", "isolate 1");

@@ -16403,8 +16410,8 @@ TEST(RunTwoIsolatesOnSingleThread) {

{

v8::Isolate::Scope iscope(isolate2);

context2 = v8::Context::New();

- v8::Context::Scope cscope(context2);

v8::HandleScope scope(isolate2);

+ v8::Context::Scope cscope(isolate2, context2);

// Run something in new isolate.

CompileRun("var foo = 'isolate 2';");

@@ -16412,8 +16419,8 @@ TEST(RunTwoIsolatesOnSingleThread) {

}

{

- v8::Context::Scope cscope(context1);

v8::HandleScope scope(isolate1);

+ v8::Context::Scope cscope(isolate1, context1);

// Now again in isolate 1

ExpectString("function f() { return foo; }; f()", "isolate 1");

}

@@ -16424,8 +16431,8 @@ TEST(RunTwoIsolatesOnSingleThread) {

v8::Persistent<v8::Context> context_default = v8::Context::New();

{

- v8::Context::Scope cscope(context_default);

v8::HandleScope scope(v8::Isolate::GetCurrent());

+ v8::Context::Scope cscope(v8::Isolate::GetCurrent(), context_default);

// Variables in other isolates should be not available, verify there

// is an exception.

ExpectTrue("function f() {"

@@ -16444,14 +16451,14 @@ TEST(RunTwoIsolatesOnSingleThread) {

{

v8::Isolate::Scope iscope(isolate2);

- v8::Context::Scope cscope(context2);

v8::HandleScope scope(v8::Isolate::GetCurrent());

+ v8::Context::Scope cscope(isolate2, context2);

ExpectString("function f() { return foo; }; f()", "isolate 2");

}

{

- v8::Context::Scope cscope(context1);

v8::HandleScope scope(v8::Isolate::GetCurrent());

+ v8::Context::Scope cscope(v8::Isolate::GetCurrent(), context1);

ExpectString("function f() { return foo; }; f()", "isolate 1");

}

@@ -16476,8 +16483,8 @@ TEST(RunTwoIsolatesOnSingleThread) {

// Check that default isolate still runs.

{

- v8::Context::Scope cscope(context_default);

v8::HandleScope scope(v8::Isolate::GetCurrent());

+ v8::Context::Scope cscope(v8::Isolate::GetCurrent(), context_default);

ExpectTrue("function f() { return isDefaultIsolate; }; f()");

}

@@ -16552,7 +16559,7 @@ TEST(IsolateDifferentContexts) {

v8::Isolate::Scope isolate_scope(isolate);

v8::HandleScope handle_scope(isolate);

context = v8::Context::New();

- v8::Context::Scope context_scope(context);

+ v8::Context::Scope context_scope(isolate, context);

Local<Value> v = CompileRun("2");

CHECK(v->IsNumber());

CHECK_EQ(2, static_cast<int>(v->NumberValue()));

@@ -16561,7 +16568,7 @@ TEST(IsolateDifferentContexts) {

v8::Isolate::Scope isolate_scope(isolate);

v8::HandleScope handle_scope(isolate);

context = v8::Context::New();

- v8::Context::Scope context_scope(context);

+ v8::Context::Scope context_scope(isolate, context);

Local<Value> v = CompileRun("22");

CHECK(v->IsNumber());

CHECK_EQ(22, static_cast<int>(v->NumberValue()));

@@ -16836,7 +16843,7 @@ class Visitor42 : public v8::PersistentHandleVisitor {

v8::Persistent<v8::Object> visited =

v8::Persistent<v8::Object>::Cast(value);

CHECK_EQ(42, visited.WrapperClassId(v8::Isolate::GetCurrent()));

- CHECK_EQ(object_, visited);

+ CHECK_EQ(Handle<Value>(*object_), Handle<Value>(*visited));

++counter_;

}

@@ -17051,11 +17058,11 @@ static void CheckContextId(v8::Handle<Object> object, int expected) {

THREADED_TEST(CreationContext) {

HandleScope handle_scope(v8::Isolate::GetCurrent());

- Persistent<Context> context1 = Context::New();

+ Handle<Context> context1 = Context::New(v8::Isolate::GetCurrent());

InstallContextId(context1, 1);

- Persistent<Context> context2 = Context::New();

+ Handle<Context> context2 = Context::New(v8::Isolate::GetCurrent());

InstallContextId(context2, 2);

- Persistent<Context> context3 = Context::New();

+ Handle<Context> context3 = Context::New(v8::Isolate::GetCurrent());

InstallContextId(context3, 3);

Local<v8::FunctionTemplate> tmpl = v8::FunctionTemplate::New();

@@ -17129,16 +17136,12 @@ THREADED_TEST(CreationContext) {

CHECK(instance2->CreationContext() == context2);

CheckContextId(instance2, 2);

}

- context1.Dispose(context1->GetIsolate());

- context2.Dispose(context2->GetIsolate());

- context3.Dispose(context3->GetIsolate());

}

THREADED_TEST(CreationContextOfJsFunction) {

HandleScope handle_scope(v8::Isolate::GetCurrent());

- Persistent<Context> context = Context::New();

+ Handle<Context> context = Context::New(v8::Isolate::GetCurrent());

InstallContextId(context, 1);

Local<Object> function;

@@ -17149,8 +17152,6 @@ THREADED_TEST(CreationContextOfJsFunction) {

CHECK(function->CreationContext() == context);

CheckContextId(function, 1);

- context.Dispose(context->GetIsolate());

}

« test/cctest/cctest.h ('K') | « test/cctest/test-alloc.cc ('k') | test/cctest/test-assembler-arm.cc » ('j') | test/cctest/test-profile-generator.cc » ('J')