Index: src/json-parser.h |
diff --git a/src/json-parser.h b/src/json-parser.h |
index ccb32866f9268d3e7fc780d811fbdb1da8fdf6d3..aab3ca452030fab93602acfa2213f789fb4b17e6 100644 |
--- a/src/json-parser.h |
+++ b/src/json-parser.h |
@@ -345,7 +345,7 @@ Handle<Object> JsonParser<seq_ascii>::ParseJsonObject() { |
Handle<Object> value = ParseJsonValue(); |
if (value.is_null()) return ReportUnexpectedCharacter(); |
- if (key->Equals(isolate()->heap()->Proto_symbol())) { |
+ if (key->Equals(isolate()->heap()->proto_string())) { |
prototype = value; |
} else { |
if (JSObject::TryTransitionToField(json_object, key)) { |
@@ -652,12 +652,12 @@ Handle<String> JsonParser<seq_ascii>::ScanJsonString() { |
? StringHasher::GetHashCore(running_hash) : length; |
Vector<const uint8_t> string_vector( |
seq_source_->GetChars() + position_, length); |
- SymbolTable* symbol_table = isolate()->heap()->symbol_table(); |
- uint32_t capacity = symbol_table->Capacity(); |
- uint32_t entry = SymbolTable::FirstProbe(hash, capacity); |
+ StringTable* string_table = isolate()->heap()->string_table(); |
+ uint32_t capacity = string_table->Capacity(); |
+ uint32_t entry = StringTable::FirstProbe(hash, capacity); |
uint32_t count = 1; |
while (true) { |
- Object* element = symbol_table->KeyAt(entry); |
+ Object* element = string_table->KeyAt(entry); |
if (element == isolate()->heap()->undefined_value()) { |
// Lookup failure. |
break; |
@@ -670,7 +670,7 @@ Handle<String> JsonParser<seq_ascii>::ScanJsonString() { |
AdvanceSkipWhitespace(); |
return Handle<String>(String::cast(element), isolate()); |
} |
- entry = SymbolTable::NextProbe(entry, count++, capacity); |
+ entry = StringTable::NextProbe(entry, count++, capacity); |
} |
} |
@@ -696,7 +696,7 @@ Handle<String> JsonParser<seq_ascii>::ScanJsonString() { |
int length = position_ - beg_pos; |
Handle<String> result; |
if (seq_ascii && is_symbol) { |
- result = factory()->LookupOneByteSymbol(seq_source_, beg_pos, length); |
+ result = factory()->InternalizeOneByteString(seq_source_, beg_pos, length); |
} else { |
result = factory()->NewRawOneByteString(length, pretenure_); |
uint8_t* dest = SeqOneByteString::cast(*result)->GetChars(); |