Index: src/arm64/macro-assembler-arm64.cc |
diff --git a/src/arm64/macro-assembler-arm64.cc b/src/arm64/macro-assembler-arm64.cc |
index 67988299c97b6cec05e5b1aaa994791c2d05f95a..a9377c80ab2b70108dfc54b36cae6da095055e0b 100644 |
--- a/src/arm64/macro-assembler-arm64.cc |
+++ b/src/arm64/macro-assembler-arm64.cc |
@@ -2424,9 +2424,10 @@ void MacroAssembler::JumpIfEitherInstanceTypeIsNotSequentialOneByte( |
Label* failure) { |
DCHECK(!AreAliased(scratch1, second)); |
DCHECK(!AreAliased(scratch1, scratch2)); |
- static const int kFlatOneByteStringMask = |
+ const int kFlatOneByteStringMask = |
kIsNotStringMask | kStringEncodingMask | kStringRepresentationMask; |
- static const int kFlatOneByteStringTag = ONE_BYTE_STRING_TYPE; |
+ const int kFlatOneByteStringTag = |
jbramley
2015/10/12 14:16:18
Note that I removed `static` only for consistency
|
+ kStringTag | kOneByteStringTag | kSeqStringTag; |
And(scratch1, first, kFlatOneByteStringMask); |
And(scratch2, second, kFlatOneByteStringMask); |
Cmp(scratch1, kFlatOneByteStringTag); |