| Index: src/arm/ic-arm.cc
|
| diff --git a/src/arm/ic-arm.cc b/src/arm/ic-arm.cc
|
| index 6038153a1a76bb200a7d7bd8eadd7746c8f3fb49..6bad5ac03e6394e6d61e539939fb14c28eb093cc 100644
|
| --- a/src/arm/ic-arm.cc
|
| +++ b/src/arm/ic-arm.cc
|
| @@ -337,7 +337,7 @@ static void GenerateFastArrayLoad(MacroAssembler* masm,
|
| // Fast case: Do the load.
|
| __ add(scratch1, elements, Operand(FixedArray::kHeaderSize - kHeapObjectTag));
|
| // The key is a smi.
|
| - ASSERT(kSmiTag == 0 && kSmiTagSize < kPointerSizeLog2);
|
| + STATIC_ASSERT(kSmiTag == 0 && kSmiTagSize < kPointerSizeLog2);
|
| __ ldr(scratch2,
|
| MemOperand(scratch1, key, LSL, kPointerSizeLog2 - kSmiTagSize));
|
| __ LoadRoot(ip, Heap::kTheHoleValueRootIndex);
|
| @@ -370,7 +370,7 @@ static void GenerateKeyStringCheck(MacroAssembler* masm,
|
| // Is the string a symbol?
|
| // map: key map
|
| __ ldrb(hash, FieldMemOperand(map, Map::kInstanceTypeOffset));
|
| - ASSERT(kSymbolTag != 0);
|
| + STATIC_ASSERT(kSymbolTag != 0);
|
| __ tst(hash, Operand(kIsSymbolMask));
|
| __ b(eq, not_symbol);
|
| }
|
| @@ -1333,7 +1333,7 @@ void KeyedStoreIC::GenerateGeneric(MacroAssembler* masm,
|
| __ cmp(key, Operand(ip));
|
| __ b(hs, &slow);
|
| // Calculate key + 1 as smi.
|
| - ASSERT_EQ(0, kSmiTag);
|
| + STATIC_ASSERT(kSmiTag == 0);
|
| __ add(r4, key, Operand(Smi::FromInt(1)));
|
| __ str(r4, FieldMemOperand(receiver, JSArray::kLengthOffset));
|
| __ b(&fast);
|
|
|