Index: test/cctest/test-regexp.cc |
diff --git a/test/cctest/test-regexp.cc b/test/cctest/test-regexp.cc |
index 504a52bc28177418b316c6ead3961b78dfa1f3e4..a9d941d9988db25f73125d1f6a91ee0662ff2593 100644 |
--- a/test/cctest/test-regexp.cc |
+++ b/test/cctest/test-regexp.cc |
@@ -98,7 +98,7 @@ using namespace v8::internal; |
static bool CheckParse(const char* input) { |
v8::HandleScope scope(CcTest::isolate()); |
- Zone zone(CcTest::i_isolate()->allocator()); |
+ Zone zone(CcTest::i_isolate()->allocator(), ZONE_NAME); |
FlatStringReader reader(CcTest::i_isolate(), CStrVector(input)); |
RegExpCompileData result; |
return v8::internal::RegExpParser::ParseRegExp( |
@@ -109,7 +109,7 @@ static bool CheckParse(const char* input) { |
static void CheckParseEq(const char* input, const char* expected, |
bool unicode = false) { |
v8::HandleScope scope(CcTest::isolate()); |
- Zone zone(CcTest::i_isolate()->allocator()); |
+ Zone zone(CcTest::i_isolate()->allocator(), ZONE_NAME); |
FlatStringReader reader(CcTest::i_isolate(), CStrVector(input)); |
RegExpCompileData result; |
JSRegExp::Flags flags = JSRegExp::kNone; |
@@ -129,7 +129,7 @@ static void CheckParseEq(const char* input, const char* expected, |
static bool CheckSimple(const char* input) { |
v8::HandleScope scope(CcTest::isolate()); |
- Zone zone(CcTest::i_isolate()->allocator()); |
+ Zone zone(CcTest::i_isolate()->allocator(), ZONE_NAME); |
FlatStringReader reader(CcTest::i_isolate(), CStrVector(input)); |
RegExpCompileData result; |
CHECK(v8::internal::RegExpParser::ParseRegExp( |
@@ -147,7 +147,7 @@ struct MinMaxPair { |
static MinMaxPair CheckMinMaxMatch(const char* input) { |
v8::HandleScope scope(CcTest::isolate()); |
- Zone zone(CcTest::i_isolate()->allocator()); |
+ Zone zone(CcTest::i_isolate()->allocator(), ZONE_NAME); |
FlatStringReader reader(CcTest::i_isolate(), CStrVector(input)); |
RegExpCompileData result; |
CHECK(v8::internal::RegExpParser::ParseRegExp( |
@@ -477,7 +477,7 @@ TEST(ParserRegression) { |
static void ExpectError(const char* input, const char* expected, |
bool unicode = false) { |
v8::HandleScope scope(CcTest::isolate()); |
- Zone zone(CcTest::i_isolate()->allocator()); |
+ Zone zone(CcTest::i_isolate()->allocator(), ZONE_NAME); |
FlatStringReader reader(CcTest::i_isolate(), CStrVector(input)); |
RegExpCompileData result; |
JSRegExp::Flags flags = JSRegExp::kNone; |
@@ -565,7 +565,7 @@ static bool NotWord(uc16 c) { |
static void TestCharacterClassEscapes(uc16 c, bool (pred)(uc16 c)) { |
- Zone zone(CcTest::i_isolate()->allocator()); |
+ Zone zone(CcTest::i_isolate()->allocator(), ZONE_NAME); |
ZoneList<CharacterRange>* ranges = |
new(&zone) ZoneList<CharacterRange>(2, &zone); |
CharacterRange::AddClassEscape(c, ranges, &zone); |
@@ -616,7 +616,7 @@ static RegExpNode* Compile(const char* input, bool multiline, bool unicode, |
static void Execute(const char* input, bool multiline, bool unicode, |
bool is_one_byte, bool dot_output = false) { |
v8::HandleScope scope(CcTest::isolate()); |
- Zone zone(CcTest::i_isolate()->allocator()); |
+ Zone zone(CcTest::i_isolate()->allocator(), ZONE_NAME); |
RegExpNode* node = Compile(input, multiline, unicode, is_one_byte, &zone); |
USE(node); |
#ifdef DEBUG |
@@ -654,7 +654,7 @@ static unsigned PseudoRandom(int i, int j) { |
TEST(SplayTreeSimple) { |
static const unsigned kLimit = 1000; |
- Zone zone(CcTest::i_isolate()->allocator()); |
+ Zone zone(CcTest::i_isolate()->allocator(), ZONE_NAME); |
ZoneSplayTree<TestConfig> tree(&zone); |
bool seen[kLimit]; |
for (unsigned i = 0; i < kLimit; i++) seen[i] = false; |
@@ -721,7 +721,7 @@ TEST(DispatchTableConstruction) { |
} |
} |
// Enter test data into dispatch table. |
- Zone zone(CcTest::i_isolate()->allocator()); |
+ Zone zone(CcTest::i_isolate()->allocator(), ZONE_NAME); |
DispatchTable table(&zone); |
for (int i = 0; i < kRangeCount; i++) { |
uc16* range = ranges[i]; |
@@ -835,7 +835,7 @@ TEST(MacroAssemblerNativeSuccess) { |
ContextInitializer initializer; |
Isolate* isolate = CcTest::i_isolate(); |
Factory* factory = isolate->factory(); |
- Zone zone(CcTest::i_isolate()->allocator()); |
+ Zone zone(CcTest::i_isolate()->allocator(), ZONE_NAME); |
ArchRegExpMacroAssembler m(isolate, &zone, NativeRegExpMacroAssembler::LATIN1, |
4); |
@@ -873,7 +873,7 @@ TEST(MacroAssemblerNativeSimple) { |
ContextInitializer initializer; |
Isolate* isolate = CcTest::i_isolate(); |
Factory* factory = isolate->factory(); |
- Zone zone(CcTest::i_isolate()->allocator()); |
+ Zone zone(CcTest::i_isolate()->allocator(), ZONE_NAME); |
ArchRegExpMacroAssembler m(isolate, &zone, NativeRegExpMacroAssembler::LATIN1, |
4); |
@@ -940,7 +940,7 @@ TEST(MacroAssemblerNativeSimpleUC16) { |
ContextInitializer initializer; |
Isolate* isolate = CcTest::i_isolate(); |
Factory* factory = isolate->factory(); |
- Zone zone(CcTest::i_isolate()->allocator()); |
+ Zone zone(CcTest::i_isolate()->allocator(), ZONE_NAME); |
ArchRegExpMacroAssembler m(isolate, &zone, NativeRegExpMacroAssembler::UC16, |
4); |
@@ -1013,7 +1013,7 @@ TEST(MacroAssemblerNativeBacktrack) { |
ContextInitializer initializer; |
Isolate* isolate = CcTest::i_isolate(); |
Factory* factory = isolate->factory(); |
- Zone zone(CcTest::i_isolate()->allocator()); |
+ Zone zone(CcTest::i_isolate()->allocator(), ZONE_NAME); |
ArchRegExpMacroAssembler m(isolate, &zone, NativeRegExpMacroAssembler::LATIN1, |
0); |
@@ -1054,7 +1054,7 @@ TEST(MacroAssemblerNativeBackReferenceLATIN1) { |
ContextInitializer initializer; |
Isolate* isolate = CcTest::i_isolate(); |
Factory* factory = isolate->factory(); |
- Zone zone(CcTest::i_isolate()->allocator()); |
+ Zone zone(CcTest::i_isolate()->allocator(), ZONE_NAME); |
ArchRegExpMacroAssembler m(isolate, &zone, NativeRegExpMacroAssembler::LATIN1, |
4); |
@@ -1104,7 +1104,7 @@ TEST(MacroAssemblerNativeBackReferenceUC16) { |
ContextInitializer initializer; |
Isolate* isolate = CcTest::i_isolate(); |
Factory* factory = isolate->factory(); |
- Zone zone(CcTest::i_isolate()->allocator()); |
+ Zone zone(CcTest::i_isolate()->allocator(), ZONE_NAME); |
ArchRegExpMacroAssembler m(isolate, &zone, NativeRegExpMacroAssembler::UC16, |
4); |
@@ -1157,7 +1157,7 @@ TEST(MacroAssemblernativeAtStart) { |
ContextInitializer initializer; |
Isolate* isolate = CcTest::i_isolate(); |
Factory* factory = isolate->factory(); |
- Zone zone(CcTest::i_isolate()->allocator()); |
+ Zone zone(CcTest::i_isolate()->allocator(), ZONE_NAME); |
ArchRegExpMacroAssembler m(isolate, &zone, NativeRegExpMacroAssembler::LATIN1, |
0); |
@@ -1217,7 +1217,7 @@ TEST(MacroAssemblerNativeBackRefNoCase) { |
ContextInitializer initializer; |
Isolate* isolate = CcTest::i_isolate(); |
Factory* factory = isolate->factory(); |
- Zone zone(CcTest::i_isolate()->allocator()); |
+ Zone zone(CcTest::i_isolate()->allocator(), ZONE_NAME); |
ArchRegExpMacroAssembler m(isolate, &zone, NativeRegExpMacroAssembler::LATIN1, |
4); |
@@ -1276,7 +1276,7 @@ TEST(MacroAssemblerNativeRegisters) { |
ContextInitializer initializer; |
Isolate* isolate = CcTest::i_isolate(); |
Factory* factory = isolate->factory(); |
- Zone zone(CcTest::i_isolate()->allocator()); |
+ Zone zone(CcTest::i_isolate()->allocator(), ZONE_NAME); |
ArchRegExpMacroAssembler m(isolate, &zone, NativeRegExpMacroAssembler::LATIN1, |
6); |
@@ -1378,7 +1378,7 @@ TEST(MacroAssemblerStackOverflow) { |
ContextInitializer initializer; |
Isolate* isolate = CcTest::i_isolate(); |
Factory* factory = isolate->factory(); |
- Zone zone(CcTest::i_isolate()->allocator()); |
+ Zone zone(CcTest::i_isolate()->allocator(), ZONE_NAME); |
ArchRegExpMacroAssembler m(isolate, &zone, NativeRegExpMacroAssembler::LATIN1, |
0); |
@@ -1417,7 +1417,7 @@ TEST(MacroAssemblerNativeLotsOfRegisters) { |
ContextInitializer initializer; |
Isolate* isolate = CcTest::i_isolate(); |
Factory* factory = isolate->factory(); |
- Zone zone(CcTest::i_isolate()->allocator()); |
+ Zone zone(CcTest::i_isolate()->allocator(), ZONE_NAME); |
ArchRegExpMacroAssembler m(isolate, &zone, NativeRegExpMacroAssembler::LATIN1, |
2); |
@@ -1465,7 +1465,7 @@ TEST(MacroAssemblerNativeLotsOfRegisters) { |
TEST(MacroAssembler) { |
byte codes[1024]; |
- Zone zone(CcTest::i_isolate()->allocator()); |
+ Zone zone(CcTest::i_isolate()->allocator(), ZONE_NAME); |
RegExpMacroAssemblerIrregexp m(CcTest::i_isolate(), Vector<byte>(codes, 1024), |
&zone); |
// ^f(o)o. |
@@ -1533,7 +1533,7 @@ TEST(AddInverseToTable) { |
static const int kLimit = 1000; |
static const int kRangeCount = 16; |
for (int t = 0; t < 10; t++) { |
- Zone zone(CcTest::i_isolate()->allocator()); |
+ Zone zone(CcTest::i_isolate()->allocator(), ZONE_NAME); |
ZoneList<CharacterRange>* ranges = |
new(&zone) ZoneList<CharacterRange>(kRangeCount, &zone); |
for (int i = 0; i < kRangeCount; i++) { |
@@ -1554,7 +1554,7 @@ TEST(AddInverseToTable) { |
CHECK_EQ(is_on, set->Get(0) == false); |
} |
} |
- Zone zone(CcTest::i_isolate()->allocator()); |
+ Zone zone(CcTest::i_isolate()->allocator(), ZONE_NAME); |
ZoneList<CharacterRange>* ranges = |
new(&zone) ZoneList<CharacterRange>(1, &zone); |
ranges->Add(CharacterRange::Range(0xFFF0, 0xFFFE), &zone); |
@@ -1667,7 +1667,7 @@ TEST(UncanonicalizeEquivalence) { |
static void TestRangeCaseIndependence(Isolate* isolate, CharacterRange input, |
Vector<CharacterRange> expected) { |
- Zone zone(CcTest::i_isolate()->allocator()); |
+ Zone zone(CcTest::i_isolate()->allocator(), ZONE_NAME); |
int count = expected.length(); |
ZoneList<CharacterRange>* list = |
new(&zone) ZoneList<CharacterRange>(count, &zone); |
@@ -1736,7 +1736,7 @@ static bool InClass(uc32 c, ZoneList<CharacterRange>* ranges) { |
TEST(UnicodeRangeSplitter) { |
- Zone zone(CcTest::i_isolate()->allocator()); |
+ Zone zone(CcTest::i_isolate()->allocator(), ZONE_NAME); |
ZoneList<CharacterRange>* base = |
new(&zone) ZoneList<CharacterRange>(1, &zone); |
base->Add(CharacterRange::Everything(), &zone); |
@@ -1780,7 +1780,7 @@ TEST(UnicodeRangeSplitter) { |
TEST(CanonicalizeCharacterSets) { |
- Zone zone(CcTest::i_isolate()->allocator()); |
+ Zone zone(CcTest::i_isolate()->allocator(), ZONE_NAME); |
ZoneList<CharacterRange>* list = |
new(&zone) ZoneList<CharacterRange>(4, &zone); |
CharacterSet set(list); |
@@ -1841,7 +1841,7 @@ TEST(CanonicalizeCharacterSets) { |
TEST(CharacterRangeMerge) { |
- Zone zone(CcTest::i_isolate()->allocator()); |
+ Zone zone(CcTest::i_isolate()->allocator(), ZONE_NAME); |
ZoneList<CharacterRange> l1(4, &zone); |
ZoneList<CharacterRange> l2(4, &zone); |
// Create all combinations of intersections of ranges, both singletons and |