| Index: test/cctest/test-regexp.cc
|
| diff --git a/test/cctest/test-regexp.cc b/test/cctest/test-regexp.cc
|
| index 1a65c060bcb8c0b2460e1c284457fd2178e0330c..c4175cb0a305caa4725cf106a33c609b61069d4e 100644
|
| --- a/test/cctest/test-regexp.cc
|
| +++ b/test/cctest/test-regexp.cc
|
| @@ -71,7 +71,7 @@ using namespace v8::internal;
|
|
|
| static bool CheckParse(const char* input) {
|
| V8::Initialize(NULL);
|
| - v8::HandleScope scope;
|
| + v8::HandleScope scope(v8::Isolate::GetCurrent());
|
| ZoneScope zone_scope(Isolate::Current()->runtime_zone(), DELETE_ON_EXIT);
|
| FlatStringReader reader(Isolate::Current(), CStrVector(input));
|
| RegExpCompileData result;
|
| @@ -82,7 +82,7 @@ static bool CheckParse(const char* input) {
|
|
|
| static SmartArrayPointer<const char> Parse(const char* input) {
|
| V8::Initialize(NULL);
|
| - v8::HandleScope scope;
|
| + v8::HandleScope scope(v8::Isolate::GetCurrent());
|
| ZoneScope zone_scope(Isolate::Current()->runtime_zone(), DELETE_ON_EXIT);
|
| FlatStringReader reader(Isolate::Current(), CStrVector(input));
|
| RegExpCompileData result;
|
| @@ -97,7 +97,7 @@ static SmartArrayPointer<const char> Parse(const char* input) {
|
|
|
| static bool CheckSimple(const char* input) {
|
| V8::Initialize(NULL);
|
| - v8::HandleScope scope;
|
| + v8::HandleScope scope(v8::Isolate::GetCurrent());
|
| ZoneScope zone_scope(Isolate::Current()->runtime_zone(), DELETE_ON_EXIT);
|
| FlatStringReader reader(Isolate::Current(), CStrVector(input));
|
| RegExpCompileData result;
|
| @@ -115,7 +115,7 @@ struct MinMaxPair {
|
|
|
| static MinMaxPair CheckMinMaxMatch(const char* input) {
|
| V8::Initialize(NULL);
|
| - v8::HandleScope scope;
|
| + v8::HandleScope scope(v8::Isolate::GetCurrent());
|
| ZoneScope zone_scope(Isolate::Current()->runtime_zone(), DELETE_ON_EXIT);
|
| FlatStringReader reader(Isolate::Current(), CStrVector(input));
|
| RegExpCompileData result;
|
| @@ -388,7 +388,7 @@ TEST(ParserRegression) {
|
| static void ExpectError(const char* input,
|
| const char* expected) {
|
| V8::Initialize(NULL);
|
| - v8::HandleScope scope;
|
| + v8::HandleScope scope(v8::Isolate::GetCurrent());
|
| ZoneScope zone_scope(Isolate::Current()->runtime_zone(), DELETE_ON_EXIT);
|
| FlatStringReader reader(Isolate::Current(), CStrVector(input));
|
| RegExpCompileData result;
|
| @@ -530,7 +530,7 @@ static void Execute(const char* input,
|
| bool multiline,
|
| bool is_ascii,
|
| bool dot_output = false) {
|
| - v8::HandleScope scope;
|
| + v8::HandleScope scope(v8::Isolate::GetCurrent());
|
| ZoneScope zone_scope(Isolate::Current()->runtime_zone(), DELETE_ON_EXIT);
|
| RegExpNode* node = Compile(input, multiline, is_ascii);
|
| USE(node);
|
| @@ -707,8 +707,9 @@ typedef RegExpMacroAssemblerMIPS ArchRegExpMacroAssembler;
|
| class ContextInitializer {
|
| public:
|
| ContextInitializer()
|
| - : env_(), scope_(), zone_(Isolate::Current()->runtime_zone(),
|
| - DELETE_ON_EXIT) {
|
| + : env_(),
|
| + scope_(v8::Isolate::GetCurrent()),
|
| + zone_(Isolate::Current()->runtime_zone(), DELETE_ON_EXIT) {
|
| env_ = v8::Context::New();
|
| env_->Enter();
|
| }
|
|
|