Index: src/objects.cc |
diff --git a/src/objects.cc b/src/objects.cc |
index 666320a50adfec3c024636ae0697674b80f194e7..ad416ed9aa0f4dfe1cd5cc5a46fd9df189e6b241 100644 |
--- a/src/objects.cc |
+++ b/src/objects.cc |
@@ -882,8 +882,9 @@ MaybeObject* String::SlowTryFlatten(PretenureFlag pretenure) { |
int len = length(); |
Object* object; |
String* result; |
- if (IsAsciiRepresentation()) { |
- { MaybeObject* maybe_object = heap->AllocateRawAsciiString(len, tenure); |
+ if (IsOneByteRepresentation()) { |
+ { MaybeObject* maybe_object = |
+ heap->AllocateRawOneByteString(len, tenure); |
if (!maybe_object->ToObject(&object)) return maybe_object; |
} |
result = String::cast(object); |
@@ -942,7 +943,7 @@ bool String::MakeExternal(v8::String::ExternalStringResource* resource) { |
if (size < ExternalString::kShortSize) { |
return false; |
} |
- bool is_ascii = this->IsAsciiRepresentation(); |
+ bool is_ascii = this->IsOneByteRepresentation(); |
bool is_symbol = this->IsSymbol(); |
// Morph the object to an external string by adjusting the map and |
@@ -6599,7 +6600,7 @@ const uc16* String::GetTwoByteData() { |
const uc16* String::GetTwoByteData(unsigned start) { |
- ASSERT(!IsAsciiRepresentationUnderneath()); |
+ ASSERT(!IsOneByteRepresentationUnderneath()); |
switch (StringShape(this).representation_tag()) { |
case kSeqStringTag: |
return SeqTwoByteString::cast(this)->SeqTwoByteStringGetData(start); |
@@ -6851,7 +6852,7 @@ const unibrow::byte* String::ReadBlock(String* input, |
} |
switch (StringShape(input).representation_tag()) { |
case kSeqStringTag: |
- if (input->IsAsciiRepresentation()) { |
+ if (input->IsOneByteRepresentation()) { |
SeqOneByteString* str = SeqOneByteString::cast(input); |
return str->SeqOneByteStringReadBlock(&rbb->remaining, |
offset_ptr, |
@@ -6868,7 +6869,7 @@ const unibrow::byte* String::ReadBlock(String* input, |
offset_ptr, |
max_chars); |
case kExternalStringTag: |
- if (input->IsAsciiRepresentation()) { |
+ if (input->IsOneByteRepresentation()) { |
return ExternalAsciiString::cast(input)->ExternalAsciiStringReadBlock( |
&rbb->remaining, |
offset_ptr, |
@@ -7000,7 +7001,7 @@ void String::ReadBlockIntoBuffer(String* input, |
switch (StringShape(input).representation_tag()) { |
case kSeqStringTag: |
- if (input->IsAsciiRepresentation()) { |
+ if (input->IsOneByteRepresentation()) { |
SeqOneByteString::cast(input)->SeqOneByteStringReadBlockIntoBuffer(rbb, |
offset_ptr, |
max_chars); |
@@ -7017,7 +7018,7 @@ void String::ReadBlockIntoBuffer(String* input, |
max_chars); |
return; |
case kExternalStringTag: |
- if (input->IsAsciiRepresentation()) { |
+ if (input->IsOneByteRepresentation()) { |
ExternalAsciiString::cast(input)-> |
ExternalAsciiStringReadBlockIntoBuffer(rbb, offset_ptr, max_chars); |
} else { |