Index: src/mips/macro-assembler-mips.cc |
diff --git a/src/mips/macro-assembler-mips.cc b/src/mips/macro-assembler-mips.cc |
index 8a44185ed70a5e48b682c2816b60821da3343c44..26e8f2110986a2c98d3ab7dc7ff0b687e732efc7 100644 |
--- a/src/mips/macro-assembler-mips.cc |
+++ b/src/mips/macro-assembler-mips.cc |
@@ -4968,9 +4968,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; |
ASSERT(kFlatAsciiStringTag <= 0xffff); // Ensure this fits 16-bit immed. |
andi(scratch1, first, kFlatAsciiStringMask); |
Branch(failure, ne, scratch1, Operand(kFlatAsciiStringTag)); |
@@ -4982,9 +4983,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)); |
Branch(failure, ne, scratch, Operand(kFlatAsciiStringTag)); |
} |