| Index: src/mips/macro-assembler-mips.h
|
| diff --git a/src/mips/macro-assembler-mips.h b/src/mips/macro-assembler-mips.h
|
| index dc5c3297bc409e41b476389a7e7a6f0ad6a757fd..5370f48c653f5617ac982d5d5af7b9f597053ea0 100644
|
| --- a/src/mips/macro-assembler-mips.h
|
| +++ b/src/mips/macro-assembler-mips.h
|
| @@ -1662,25 +1662,22 @@ const Operand& rt = Operand(zero_reg), BranchDelaySlot bd = PROTECT
|
| // in a0. Assumes that any other register can be used as a scratch.
|
| void CheckEnumCache(Label* call_runtime);
|
|
|
| - // AllocationMemento support. Arrays may have an associated
|
| - // AllocationMemento object that can be checked for in order to pretransition
|
| - // to another type.
|
| - // On entry, receiver_reg should point to the array object.
|
| - // scratch_reg gets clobbered.
|
| - // If allocation info is present, jump to allocation_memento_present.
|
| - void TestJSArrayForAllocationMemento(
|
| - Register receiver_reg,
|
| - Register scratch_reg,
|
| - Label* no_memento_found,
|
| - Condition cond = al,
|
| - Label* allocation_memento_present = NULL);
|
| + // AllocationMemento support. Arrays may have an associated AllocationMemento
|
| + // object that can be checked for in order to pretransition to another type.
|
| + // On entry, receiver_reg should point to the array object. scratch_reg gets
|
| + // clobbered. If no info is present jump to no_memento_found, otherwise fall
|
| + // through.
|
| + void TestJSArrayForAllocationMemento(Register receiver_reg,
|
| + Register scratch_reg,
|
| + Label* no_memento_found);
|
|
|
| void JumpIfJSArrayHasAllocationMemento(Register receiver_reg,
|
| Register scratch_reg,
|
| Label* memento_found) {
|
| Label no_memento_found;
|
| TestJSArrayForAllocationMemento(receiver_reg, scratch_reg,
|
| - &no_memento_found, eq, memento_found);
|
| + &no_memento_found);
|
| + Branch(memento_found);
|
| bind(&no_memento_found);
|
| }
|
|
|
|
|