| Index: test/cctest/test-parsing.cc
|
| diff --git a/test/cctest/test-parsing.cc b/test/cctest/test-parsing.cc
|
| index 98a5870a025e2708cd35632c8d7be114c7cf2357..39856b67612094866a3df1cc88185fa56351f37d 100755
|
| --- a/test/cctest/test-parsing.cc
|
| +++ b/test/cctest/test-parsing.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright 2006-2009 the V8 project authors. All rights reserved.
|
| +// Copyright 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:
|
| @@ -258,14 +258,14 @@ TEST(StandAlonePreParser) {
|
| NULL
|
| };
|
|
|
| - uintptr_t stack_limit = ISOLATE->stack_guard()->real_climit();
|
| + uintptr_t stack_limit = i::Isolate::Current()->stack_guard()->real_climit();
|
| for (int i = 0; programs[i]; i++) {
|
| const char* program = programs[i];
|
| i::Utf8ToUC16CharacterStream stream(
|
| reinterpret_cast<const i::byte*>(program),
|
| static_cast<unsigned>(strlen(program)));
|
| i::CompleteParserRecorder log;
|
| - i::V8JavaScriptScanner scanner(ISOLATE->scanner_constants());
|
| + i::V8JavaScriptScanner scanner(i::Isolate::Current()->unicode_cache());
|
| scanner.Initialize(&stream);
|
|
|
| v8::preparser::PreParser::PreParseResult result =
|
| @@ -282,7 +282,7 @@ TEST(StandAlonePreParser) {
|
|
|
| TEST(RegressChromium62639) {
|
| int marker;
|
| - ISOLATE->stack_guard()->SetStackLimit(
|
| + i::Isolate::Current()->stack_guard()->SetStackLimit(
|
| reinterpret_cast<uintptr_t>(&marker) - 128 * 1024);
|
|
|
| const char* program = "var x = 'something';\n"
|
| @@ -307,7 +307,7 @@ TEST(Regress928) {
|
| // the block could be lazily compiled, and an extra, unexpected,
|
| // entry was added to the data.
|
| int marker;
|
| - ISOLATE->stack_guard()->SetStackLimit(
|
| + i::Isolate::Current()->stack_guard()->SetStackLimit(
|
| reinterpret_cast<uintptr_t>(&marker) - 128 * 1024);
|
|
|
| const char* program =
|
| @@ -343,7 +343,7 @@ TEST(Regress928) {
|
|
|
| TEST(PreParseOverflow) {
|
| int marker;
|
| - ISOLATE->stack_guard()->SetStackLimit(
|
| + i::Isolate::Current()->stack_guard()->SetStackLimit(
|
| reinterpret_cast<uintptr_t>(&marker) - 128 * 1024);
|
|
|
| size_t kProgramSize = 1024 * 1024;
|
| @@ -352,13 +352,13 @@ TEST(PreParseOverflow) {
|
| memset(*program, '(', kProgramSize);
|
| program[kProgramSize] = '\0';
|
|
|
| - uintptr_t stack_limit = ISOLATE->stack_guard()->real_climit();
|
| + uintptr_t stack_limit = i::Isolate::Current()->stack_guard()->real_climit();
|
|
|
| i::Utf8ToUC16CharacterStream stream(
|
| reinterpret_cast<const i::byte*>(*program),
|
| static_cast<unsigned>(kProgramSize));
|
| i::CompleteParserRecorder log;
|
| - i::V8JavaScriptScanner scanner(ISOLATE->scanner_constants());
|
| + i::V8JavaScriptScanner scanner(i::Isolate::Current()->unicode_cache());
|
| scanner.Initialize(&stream);
|
|
|
|
|
| @@ -576,7 +576,7 @@ void TestStreamScanner(i::UC16CharacterStream* stream,
|
| i::Token::Value* expected_tokens,
|
| int skip_pos = 0, // Zero means not skipping.
|
| int skip_to = 0) {
|
| - i::V8JavaScriptScanner scanner(ISOLATE->scanner_constants());
|
| + i::V8JavaScriptScanner scanner(i::Isolate::Current()->unicode_cache());
|
| scanner.Initialize(stream);
|
|
|
| int i = 0;
|
| @@ -655,7 +655,7 @@ void TestScanRegExp(const char* re_source, const char* expected) {
|
| i::Utf8ToUC16CharacterStream stream(
|
| reinterpret_cast<const i::byte*>(re_source),
|
| static_cast<unsigned>(strlen(re_source)));
|
| - i::V8JavaScriptScanner scanner(ISOLATE->scanner_constants());
|
| + i::V8JavaScriptScanner scanner(i::Isolate::Current()->unicode_cache());
|
| scanner.Initialize(&stream);
|
|
|
| i::Token::Value start = scanner.peek();
|
|
|