Index: src/arm/code-stubs-arm.cc |
diff --git a/src/arm/code-stubs-arm.cc b/src/arm/code-stubs-arm.cc |
index 399cfe4ed596d3a14070621d85c302f43021b763..1e73a55871606f4ce7b2708b856ef6e2e9a3f9d8 100644 |
--- a/src/arm/code-stubs-arm.cc |
+++ b/src/arm/code-stubs-arm.cc |
@@ -4923,7 +4923,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) { |
// subject: Subject string |
// regexp_data: RegExp data (FixedArray) |
// r0: Instance type of subject string |
- STATIC_ASSERT(4 == kAsciiStringTag); |
+ STATIC_ASSERT(4 == kOneByteStringTag); |
STATIC_ASSERT(kTwoByteStringTag == 0); |
// Find the code object based on the assumptions above. |
__ and_(r0, r0, Operand(kStringEncodingMask)); |
@@ -6091,7 +6091,7 @@ void SubStringStub::Generate(MacroAssembler* masm) { |
// string's encoding is wrong because we always have to recheck encoding of |
// the newly created string's parent anyways due to externalized strings. |
Label two_byte_slice, set_slice_header; |
- STATIC_ASSERT((kStringEncodingMask & kAsciiStringTag) != 0); |
+ STATIC_ASSERT((kStringEncodingMask & kOneByteStringTag) != 0); |
STATIC_ASSERT((kStringEncodingMask & kTwoByteStringTag) == 0); |
__ tst(r1, Operand(kStringEncodingMask)); |
__ b(eq, &two_byte_slice); |
@@ -6134,7 +6134,7 @@ void SubStringStub::Generate(MacroAssembler* masm) { |
__ bind(&allocate_result); |
// Sequential acii string. Allocate the result. |
- STATIC_ASSERT((kAsciiStringTag & kStringEncodingMask) != 0); |
+ STATIC_ASSERT((kOneByteStringTag & kStringEncodingMask) != 0); |
__ tst(r1, Operand(kStringEncodingMask)); |
__ b(eq, &two_byte_sequential); |
@@ -6499,9 +6499,9 @@ void StringAddStub::Generate(MacroAssembler* masm) { |
__ tst(r5, Operand(kAsciiDataHintMask), ne); |
__ b(ne, &ascii_data); |
__ eor(r4, r4, Operand(r5)); |
- STATIC_ASSERT(kAsciiStringTag != 0 && kAsciiDataHintTag != 0); |
- __ and_(r4, r4, Operand(kAsciiStringTag | kAsciiDataHintTag)); |
- __ cmp(r4, Operand(kAsciiStringTag | kAsciiDataHintTag)); |
+ STATIC_ASSERT(kOneByteStringTag != 0 && kAsciiDataHintTag != 0); |
+ __ and_(r4, r4, Operand(kOneByteStringTag | kAsciiDataHintTag)); |
+ __ cmp(r4, Operand(kOneByteStringTag | kAsciiDataHintTag)); |
__ b(eq, &ascii_data); |
// Allocate a two byte cons string. |