Index: src/ia32/full-codegen-ia32.cc |
diff --git a/src/ia32/full-codegen-ia32.cc b/src/ia32/full-codegen-ia32.cc |
index 04fc17d076a6fcb7cf404490333197ae908c328d..1990f687b1d33f6138d93f0092d8c6998d6b494a 100644 |
--- a/src/ia32/full-codegen-ia32.cc |
+++ b/src/ia32/full-codegen-ia32.cc |
@@ -3754,7 +3754,7 @@ void FullCodeGenerator::EmitGetCachedArrayIndex(CallRuntime* expr) { |
} |
-void FullCodeGenerator::EmitFastAsciiArrayJoin(CallRuntime* expr) { |
+void FullCodeGenerator::EmitFastOneByteArrayJoin(CallRuntime* expr) { |
Label bailout, done, one_char_separator, long_separator, |
non_trivial_array, not_size_one_array, loop, |
loop_1, loop_1_condition, loop_2, loop_2_entry, loop_3, loop_3_entry; |
@@ -3812,7 +3812,7 @@ void FullCodeGenerator::EmitFastAsciiArrayJoin(CallRuntime* expr) { |
array = no_reg; |
- // Check that all array elements are sequential ASCII strings, and |
+ // Check that all array elements are sequential one-byte strings, and |
// accumulate the sum of their lengths, as a smi-encoded value. |
__ Move(index, Immediate(0)); |
__ Move(string_length, Immediate(0)); |
@@ -3821,7 +3821,7 @@ void FullCodeGenerator::EmitFastAsciiArrayJoin(CallRuntime* expr) { |
// scratch, string_length, elements. |
if (generate_debug_code_) { |
__ cmp(index, array_length); |
- __ Assert(less, kNoEmptyArraysHereInEmitFastAsciiArrayJoin); |
+ __ Assert(less, kNoEmptyArraysHereInEmitFastOneByteArrayJoin); |
} |
__ bind(&loop); |
__ mov(string, FieldOperand(elements, |
@@ -3859,7 +3859,7 @@ void FullCodeGenerator::EmitFastAsciiArrayJoin(CallRuntime* expr) { |
// string_length: Sum of string lengths, as a smi. |
// elements: FixedArray of strings. |
- // Check that the separator is a flat ASCII string. |
+ // Check that the separator is a flat one-byte string. |
__ mov(string, separator_operand); |
__ JumpIfSmi(string, &bailout); |
__ mov(scratch, FieldOperand(string, HeapObject::kMapOffset)); |
@@ -3883,8 +3883,8 @@ void FullCodeGenerator::EmitFastAsciiArrayJoin(CallRuntime* expr) { |
// Live registers and stack values: |
// string_length |
// elements |
- __ AllocateAsciiString(result_pos, string_length, scratch, |
- index, string, &bailout); |
+ __ AllocateOneByteString(result_pos, string_length, scratch, index, string, |
+ &bailout); |
__ mov(result_operand, result_pos); |
__ lea(result_pos, FieldOperand(result_pos, SeqOneByteString::kHeaderSize)); |
@@ -3927,7 +3927,7 @@ void FullCodeGenerator::EmitFastAsciiArrayJoin(CallRuntime* expr) { |
// One-character separator case |
__ bind(&one_char_separator); |
- // Replace separator with its ASCII character value. |
+ // Replace separator with its one-byte character value. |
__ mov_b(scratch, FieldOperand(string, SeqOneByteString::kHeaderSize)); |
__ mov_b(separator_operand, scratch); |