Index: src/ia32/macro-assembler-ia32.cc |
diff --git a/src/ia32/macro-assembler-ia32.cc b/src/ia32/macro-assembler-ia32.cc |
index b20e0668181723fa09c0a82def41caae3a21c860..41c8667f1c726224776f18f5d2678f453ce76189 100644 |
--- a/src/ia32/macro-assembler-ia32.cc |
+++ b/src/ia32/macro-assembler-ia32.cc |
@@ -1458,14 +1458,14 @@ void MacroAssembler::AllocateAsciiString(Register result, |
Label* gc_required) { |
// Calculate the number of bytes needed for the characters in the string while |
// observing object alignment. |
- ASSERT((SeqAsciiString::kHeaderSize & kObjectAlignmentMask) == 0); |
+ ASSERT((SeqOneByteString::kHeaderSize & kObjectAlignmentMask) == 0); |
mov(scratch1, length); |
ASSERT(kCharSize == 1); |
add(scratch1, Immediate(kObjectAlignmentMask)); |
and_(scratch1, Immediate(~kObjectAlignmentMask)); |
// Allocate ASCII string in new space. |
- AllocateInNewSpace(SeqAsciiString::kHeaderSize, |
+ AllocateInNewSpace(SeqOneByteString::kHeaderSize, |
times_1, |
scratch1, |
result, |
@@ -1493,7 +1493,7 @@ void MacroAssembler::AllocateAsciiString(Register result, |
ASSERT(length > 0); |
// Allocate ASCII string in new space. |
- AllocateInNewSpace(SeqAsciiString::SizeFor(length), |
+ AllocateInNewSpace(SeqOneByteString::SizeFor(length), |
result, |
scratch1, |
scratch2, |
@@ -2920,8 +2920,8 @@ void MacroAssembler::EnsureNotWhite( |
// Value now either 4 (if ASCII) or 8 (if UC16), i.e., char-size shifted |
// by 2. If we multiply the string length as smi by this, it still |
// won't overflow a 32-bit value. |
- ASSERT_EQ(SeqAsciiString::kMaxSize, SeqTwoByteString::kMaxSize); |
- ASSERT(SeqAsciiString::kMaxSize <= |
+ ASSERT_EQ(SeqOneByteString::kMaxSize, SeqTwoByteString::kMaxSize); |
+ ASSERT(SeqOneByteString::kMaxSize <= |
static_cast<int>(0xffffffffu >> (2 + kSmiTagSize))); |
imul(length, FieldOperand(value, String::kLengthOffset)); |
shr(length, 2 + kSmiTagSize + kSmiShiftSize); |