| Index: src/x64/codegen-x64.cc
|
| diff --git a/src/x64/codegen-x64.cc b/src/x64/codegen-x64.cc
|
| index 7f371b59f67e33cf3cd40d7ac860112eb5165ab4..44e1618c319b5abe542cb183618bb05598523235 100644
|
| --- a/src/x64/codegen-x64.cc
|
| +++ b/src/x64/codegen-x64.cc
|
| @@ -522,7 +522,7 @@ void StringCharLoadGenerator::Generate(MacroAssembler* masm,
|
| __ j(zero, &seq_string, Label::kNear);
|
|
|
| // Handle external strings.
|
| - Label ascii_external, done;
|
| + Label one_byte_external, done;
|
| if (FLAG_debug_code) {
|
| // Assert that we do not have a cons or slice (indirect strings) here.
|
| // Sequential strings have already been ruled out.
|
| @@ -537,22 +537,22 @@ void StringCharLoadGenerator::Generate(MacroAssembler* masm,
|
| STATIC_ASSERT(kTwoByteStringTag == 0);
|
| __ testb(result, Immediate(kStringEncodingMask));
|
| __ movp(result, FieldOperand(string, ExternalString::kResourceDataOffset));
|
| - __ j(not_equal, &ascii_external, Label::kNear);
|
| + __ j(not_equal, &one_byte_external, Label::kNear);
|
| // Two-byte string.
|
| __ movzxwl(result, Operand(result, index, times_2, 0));
|
| __ jmp(&done, Label::kNear);
|
| - __ bind(&ascii_external);
|
| - // Ascii string.
|
| + __ bind(&one_byte_external);
|
| + // One-byte string.
|
| __ movzxbl(result, Operand(result, index, times_1, 0));
|
| __ jmp(&done, Label::kNear);
|
|
|
| - // Dispatch on the encoding: ASCII or two-byte.
|
| - Label ascii;
|
| + // Dispatch on the encoding: one-byte or two-byte.
|
| + Label one_byte;
|
| __ bind(&seq_string);
|
| STATIC_ASSERT((kStringEncodingMask & kOneByteStringTag) != 0);
|
| STATIC_ASSERT((kStringEncodingMask & kTwoByteStringTag) == 0);
|
| __ testb(result, Immediate(kStringEncodingMask));
|
| - __ j(not_zero, &ascii, Label::kNear);
|
| + __ j(not_zero, &one_byte, Label::kNear);
|
|
|
| // Two-byte string.
|
| // Load the two-byte character code into the result register.
|
| @@ -563,9 +563,9 @@ void StringCharLoadGenerator::Generate(MacroAssembler* masm,
|
| SeqTwoByteString::kHeaderSize));
|
| __ jmp(&done, Label::kNear);
|
|
|
| - // ASCII string.
|
| + // One-byte string.
|
| // Load the byte into the result register.
|
| - __ bind(&ascii);
|
| + __ bind(&one_byte);
|
| __ movzxbl(result, FieldOperand(string,
|
| index,
|
| times_1,
|
|
|