| Index: src/x64/macro-assembler-x64.cc
|
| diff --git a/src/x64/macro-assembler-x64.cc b/src/x64/macro-assembler-x64.cc
|
| index 65a408b48bc3d466a72217d48d500a9cf559d3ed..a0ebfdc95d164f7ab6bbcbadda93eed1e0f53069 100644
|
| --- a/src/x64/macro-assembler-x64.cc
|
| +++ b/src/x64/macro-assembler-x64.cc
|
| @@ -1311,8 +1311,7 @@ void MacroAssembler::JumpIfNotBothSequentialAsciiStrings(Register first_object,
|
| ASSERT(kNotStringTag != 0);
|
| const int kFlatAsciiStringMask =
|
| kIsNotStringMask | kStringRepresentationMask | kStringEncodingMask;
|
| - const int kFlatAsciiStringBits =
|
| - kNotStringTag | kSeqStringTag | kAsciiStringTag;
|
| + const int kFlatAsciiStringTag = ASCII_STRING_TYPE;
|
|
|
| andl(scratch1, Immediate(kFlatAsciiStringMask));
|
| andl(scratch2, Immediate(kFlatAsciiStringMask));
|
| @@ -1320,7 +1319,7 @@ void MacroAssembler::JumpIfNotBothSequentialAsciiStrings(Register first_object,
|
| ASSERT_EQ(0, kFlatAsciiStringMask & (kFlatAsciiStringMask << 3));
|
| lea(scratch1, Operand(scratch1, scratch2, times_8, 0));
|
| cmpl(scratch1,
|
| - Immediate(kFlatAsciiStringBits + (kFlatAsciiStringBits << 3)));
|
| + Immediate(kFlatAsciiStringTag + (kFlatAsciiStringTag << 3)));
|
| j(not_equal, on_fail);
|
| }
|
|
|
|
|