| Index: src/arm/macro-assembler-arm.cc
|
| diff --git a/src/arm/macro-assembler-arm.cc b/src/arm/macro-assembler-arm.cc
|
| index 8416926b46adaccce279e32ab64dd7ad85f2677c..4266d4186133c8c50dbf3675cca3282c1db5b1e5 100644
|
| --- a/src/arm/macro-assembler-arm.cc
|
| +++ b/src/arm/macro-assembler-arm.cc
|
| @@ -3260,9 +3260,10 @@ void MacroAssembler::JumpIfBothInstanceTypesAreNotSequentialAscii(
|
| Register scratch1,
|
| Register scratch2,
|
| Label* failure) {
|
| - int kFlatAsciiStringMask =
|
| + const int kFlatAsciiStringMask =
|
| kIsNotStringMask | kStringEncodingMask | kStringRepresentationMask;
|
| - int kFlatAsciiStringTag = ASCII_STRING_TYPE;
|
| + const int kFlatAsciiStringTag =
|
| + kStringTag | kOneByteStringTag | kSeqStringTag;
|
| and_(scratch1, first, Operand(kFlatAsciiStringMask));
|
| and_(scratch2, second, Operand(kFlatAsciiStringMask));
|
| cmp(scratch1, Operand(kFlatAsciiStringTag));
|
| @@ -3275,9 +3276,10 @@ void MacroAssembler::JumpIfBothInstanceTypesAreNotSequentialAscii(
|
| void MacroAssembler::JumpIfInstanceTypeIsNotSequentialAscii(Register type,
|
| Register scratch,
|
| Label* failure) {
|
| - int kFlatAsciiStringMask =
|
| + const int kFlatAsciiStringMask =
|
| kIsNotStringMask | kStringEncodingMask | kStringRepresentationMask;
|
| - int kFlatAsciiStringTag = ASCII_STRING_TYPE;
|
| + const int kFlatAsciiStringTag =
|
| + kStringTag | kOneByteStringTag | kSeqStringTag;
|
| and_(scratch, type, Operand(kFlatAsciiStringMask));
|
| cmp(scratch, Operand(kFlatAsciiStringTag));
|
| b(ne, failure);
|
|
|