| Index: src/mips64/ic-mips64.cc
|
| diff --git a/src/mips64/ic-mips64.cc b/src/mips64/ic-mips64.cc
|
| index 9f82945eda3b907b13568b0690ed87948f3fa44c..5187342329dea6bf4a183a0e379932d9bda1c0f1 100644
|
| --- a/src/mips64/ic-mips64.cc
|
| +++ b/src/mips64/ic-mips64.cc
|
| @@ -172,7 +172,7 @@ static void GenerateKeyedLoadReceiverCheck(MacroAssembler* masm,
|
| // In the case that the object is a value-wrapper object,
|
| // we enter the runtime system to make sure that indexing into string
|
| // objects work as intended.
|
| - ASSERT(JS_OBJECT_TYPE > JS_VALUE_TYPE);
|
| + DCHECK(JS_OBJECT_TYPE > JS_VALUE_TYPE);
|
| __ lbu(scratch, FieldMemOperand(map, Map::kInstanceTypeOffset));
|
| __ Branch(slow, lt, scratch, Operand(JS_OBJECT_TYPE));
|
| }
|
| @@ -279,8 +279,8 @@ void LoadIC::GenerateMegamorphic(MacroAssembler* masm) {
|
| // The return address is in lr.
|
| Register receiver = ReceiverRegister();
|
| Register name = NameRegister();
|
| - ASSERT(receiver.is(a1));
|
| - ASSERT(name.is(a2));
|
| + DCHECK(receiver.is(a1));
|
| + DCHECK(name.is(a2));
|
|
|
| // Probe the stub cache.
|
| Code::Flags flags = Code::RemoveTypeAndHolderFromFlags(
|
| @@ -295,8 +295,8 @@ void LoadIC::GenerateMegamorphic(MacroAssembler* masm) {
|
|
|
| void LoadIC::GenerateNormal(MacroAssembler* masm) {
|
| Register dictionary = a0;
|
| - ASSERT(!dictionary.is(ReceiverRegister()));
|
| - ASSERT(!dictionary.is(NameRegister()));
|
| + DCHECK(!dictionary.is(ReceiverRegister()));
|
| + DCHECK(!dictionary.is(NameRegister()));
|
| Label slow;
|
|
|
| __ ld(dictionary,
|
| @@ -433,8 +433,8 @@ void KeyedLoadIC::GenerateSloppyArguments(MacroAssembler* masm) {
|
| // The return address is in ra.
|
| Register receiver = ReceiverRegister();
|
| Register key = NameRegister();
|
| - ASSERT(receiver.is(a1));
|
| - ASSERT(key.is(a2));
|
| + DCHECK(receiver.is(a1));
|
| + DCHECK(key.is(a2));
|
|
|
| Label slow, notin;
|
| MemOperand mapped_location =
|
| @@ -460,7 +460,7 @@ void KeyedStoreIC::GenerateSloppyArguments(MacroAssembler* masm) {
|
| Register receiver = ReceiverRegister();
|
| Register key = NameRegister();
|
| Register value = ValueRegister();
|
| - ASSERT(value.is(a0));
|
| + DCHECK(value.is(a0));
|
|
|
| Label slow, notin;
|
| // Store address is returned in register (of MemOperand) mapped_location.
|
| @@ -468,7 +468,7 @@ void KeyedStoreIC::GenerateSloppyArguments(MacroAssembler* masm) {
|
| masm, receiver, key, a3, a4, a5, ¬in, &slow);
|
| __ sd(value, mapped_location);
|
| __ mov(t1, value);
|
| - ASSERT_EQ(mapped_location.offset(), 0);
|
| + DCHECK_EQ(mapped_location.offset(), 0);
|
| __ RecordWrite(a3, mapped_location.rm(), t1,
|
| kRAHasNotBeenSaved, kDontSaveFPRegs);
|
| __ Ret(USE_DELAY_SLOT);
|
| @@ -480,7 +480,7 @@ void KeyedStoreIC::GenerateSloppyArguments(MacroAssembler* masm) {
|
| GenerateUnmappedArgumentsLookup(masm, key, a3, a4, &slow);
|
| __ sd(value, unmapped_location);
|
| __ mov(t1, value);
|
| - ASSERT_EQ(unmapped_location.offset(), 0);
|
| + DCHECK_EQ(unmapped_location.offset(), 0);
|
| __ RecordWrite(a3, unmapped_location.rm(), t1,
|
| kRAHasNotBeenSaved, kDontSaveFPRegs);
|
| __ Ret(USE_DELAY_SLOT);
|
| @@ -512,13 +512,13 @@ const Register LoadIC::NameRegister() { return a2; }
|
|
|
|
|
| const Register LoadIC::SlotRegister() {
|
| - ASSERT(FLAG_vector_ics);
|
| + DCHECK(FLAG_vector_ics);
|
| return a0;
|
| }
|
|
|
|
|
| const Register LoadIC::VectorRegister() {
|
| - ASSERT(FLAG_vector_ics);
|
| + DCHECK(FLAG_vector_ics);
|
| return a3;
|
| }
|
|
|
| @@ -549,8 +549,8 @@ void KeyedLoadIC::GenerateGeneric(MacroAssembler* masm) {
|
|
|
| Register key = NameRegister();
|
| Register receiver = ReceiverRegister();
|
| - ASSERT(key.is(a2));
|
| - ASSERT(receiver.is(a1));
|
| + DCHECK(key.is(a2));
|
| + DCHECK(receiver.is(a1));
|
|
|
| Isolate* isolate = masm->isolate();
|
|
|
| @@ -727,7 +727,7 @@ void KeyedLoadIC::GenerateString(MacroAssembler* masm) {
|
| Register index = NameRegister();
|
| Register scratch = a3;
|
| Register result = v0;
|
| - ASSERT(!scratch.is(receiver) && !scratch.is(index));
|
| + DCHECK(!scratch.is(receiver) && !scratch.is(index));
|
|
|
| StringCharAtGenerator char_at_generator(receiver,
|
| index,
|
| @@ -951,7 +951,7 @@ void KeyedStoreIC::GenerateGeneric(MacroAssembler* masm,
|
| Register value = ValueRegister();
|
| Register key = NameRegister();
|
| Register receiver = ReceiverRegister();
|
| - ASSERT(value.is(a0));
|
| + DCHECK(value.is(a0));
|
| Register receiver_map = a3;
|
| Register elements_map = a6;
|
| Register elements = a7; // Elements array of the receiver.
|
| @@ -1039,8 +1039,8 @@ void KeyedLoadIC::GenerateIndexedInterceptor(MacroAssembler* masm) {
|
| Register key = NameRegister();
|
| Register scratch1 = a3;
|
| Register scratch2 = a4;
|
| - ASSERT(!scratch1.is(receiver) && !scratch1.is(key));
|
| - ASSERT(!scratch2.is(receiver) && !scratch2.is(key));
|
| + DCHECK(!scratch1.is(receiver) && !scratch1.is(key));
|
| + DCHECK(!scratch2.is(receiver) && !scratch2.is(key));
|
|
|
| // Check that the receiver isn't a smi.
|
| __ JumpIfSmi(receiver, &slow);
|
| @@ -1107,9 +1107,9 @@ void KeyedStoreIC::GenerateSlow(MacroAssembler* masm) {
|
| void StoreIC::GenerateMegamorphic(MacroAssembler* masm) {
|
| Register receiver = ReceiverRegister();
|
| Register name = NameRegister();
|
| - ASSERT(receiver.is(a1));
|
| - ASSERT(name.is(a2));
|
| - ASSERT(ValueRegister().is(a0));
|
| + DCHECK(receiver.is(a1));
|
| + DCHECK(name.is(a2));
|
| + DCHECK(ValueRegister().is(a0));
|
|
|
| // Get the receiver from the stack and probe the stub cache.
|
| Code::Flags flags = Code::RemoveTypeAndHolderFromFlags(
|
| @@ -1137,7 +1137,7 @@ void StoreIC::GenerateNormal(MacroAssembler* masm) {
|
| Register name = NameRegister();
|
| Register value = ValueRegister();
|
| Register dictionary = a3;
|
| - ASSERT(!AreAliased(value, receiver, name, dictionary, a4, a5));
|
| + DCHECK(!AreAliased(value, receiver, name, dictionary, a4, a5));
|
|
|
| __ ld(dictionary, FieldMemOperand(receiver, JSObject::kPropertiesOffset));
|
|
|
| @@ -1243,19 +1243,19 @@ void PatchInlinedSmiCode(Address address, InlinedSmiCheck check) {
|
| CodePatcher patcher(patch_address, 2);
|
| Register reg = Register::from_code(Assembler::GetRs(instr_at_patch));
|
| if (check == ENABLE_INLINED_SMI_CHECK) {
|
| - ASSERT(Assembler::IsAndImmediate(instr_at_patch));
|
| - ASSERT_EQ(0, Assembler::GetImmediate16(instr_at_patch));
|
| + DCHECK(Assembler::IsAndImmediate(instr_at_patch));
|
| + DCHECK_EQ(0, Assembler::GetImmediate16(instr_at_patch));
|
| patcher.masm()->andi(at, reg, kSmiTagMask);
|
| } else {
|
| - ASSERT(check == DISABLE_INLINED_SMI_CHECK);
|
| - ASSERT(Assembler::IsAndImmediate(instr_at_patch));
|
| + DCHECK(check == DISABLE_INLINED_SMI_CHECK);
|
| + DCHECK(Assembler::IsAndImmediate(instr_at_patch));
|
| patcher.masm()->andi(at, reg, 0);
|
| }
|
| - ASSERT(Assembler::IsBranch(branch_instr));
|
| + DCHECK(Assembler::IsBranch(branch_instr));
|
| if (Assembler::IsBeq(branch_instr)) {
|
| patcher.ChangeBranchCondition(ne);
|
| } else {
|
| - ASSERT(Assembler::IsBne(branch_instr));
|
| + DCHECK(Assembler::IsBne(branch_instr));
|
| patcher.ChangeBranchCondition(eq);
|
| }
|
| }
|
|
|