| Index: src/x64/code-stubs-x64.cc
|
| diff --git a/src/x64/code-stubs-x64.cc b/src/x64/code-stubs-x64.cc
|
| index 18ae63376521ee597768a747e76b852897bdfd84..3a9a0234e2e8ed1d1f511687c6f26a493aef21f3 100644
|
| --- a/src/x64/code-stubs-x64.cc
|
| +++ b/src/x64/code-stubs-x64.cc
|
| @@ -4913,16 +4913,16 @@ void StringAddStub::Generate(MacroAssembler* masm) {
|
| __ ret(2 * kPointerSize);
|
| __ bind(&non_ascii);
|
| // At least one of the strings is two-byte. Check whether it happens
|
| - // to contain only ASCII characters.
|
| + // to contain only one byte characters.
|
| // rcx: first instance type AND second instance type.
|
| // r8: first instance type.
|
| // r9: second instance type.
|
| - __ testb(rcx, Immediate(kAsciiDataHintMask));
|
| + __ testb(rcx, Immediate(kOneByteDataHintMask));
|
| __ j(not_zero, &ascii_data);
|
| __ xor_(r8, r9);
|
| - STATIC_ASSERT(kOneByteStringTag != 0 && kAsciiDataHintTag != 0);
|
| - __ andb(r8, Immediate(kOneByteStringTag | kAsciiDataHintTag));
|
| - __ cmpb(r8, Immediate(kOneByteStringTag | kAsciiDataHintTag));
|
| + STATIC_ASSERT(kOneByteStringTag != 0 && kOneByteDataHintTag != 0);
|
| + __ andb(r8, Immediate(kOneByteStringTag | kOneByteDataHintTag));
|
| + __ cmpb(r8, Immediate(kOneByteStringTag | kOneByteDataHintTag));
|
| __ j(equal, &ascii_data);
|
| // Allocate a two byte cons string.
|
| __ AllocateTwoByteConsString(rcx, rdi, no_reg, &call_runtime);
|
|
|