| Index: src/arm/code-stubs-arm.cc
|
| diff --git a/src/arm/code-stubs-arm.cc b/src/arm/code-stubs-arm.cc
|
| index f67b9953eb0292063810972512f123a48b6e87b0..b4ffa7d4d8271cf8de396595d1d96a7f6b837ca3 100644
|
| --- a/src/arm/code-stubs-arm.cc
|
| +++ b/src/arm/code-stubs-arm.cc
|
| @@ -3232,72 +3232,12 @@ void KeyedLoadICStub::GenerateImpl(MacroAssembler* masm, bool in_frame) {
|
| __ jmp(&compare_map);
|
| }
|
|
|
| -void StoreICTrampolineStub::Generate(MacroAssembler* masm) {
|
| - __ EmitLoadTypeFeedbackVector(StoreWithVectorDescriptor::VectorRegister());
|
| - StoreICStub stub(isolate(), state());
|
| - stub.GenerateForTrampoline(masm);
|
| -}
|
| -
|
| void KeyedStoreICTrampolineStub::Generate(MacroAssembler* masm) {
|
| __ EmitLoadTypeFeedbackVector(StoreWithVectorDescriptor::VectorRegister());
|
| KeyedStoreICStub stub(isolate(), state());
|
| stub.GenerateForTrampoline(masm);
|
| }
|
|
|
| -void StoreICStub::Generate(MacroAssembler* masm) { GenerateImpl(masm, false); }
|
| -
|
| -void StoreICStub::GenerateForTrampoline(MacroAssembler* masm) {
|
| - GenerateImpl(masm, true);
|
| -}
|
| -
|
| -void StoreICStub::GenerateImpl(MacroAssembler* masm, bool in_frame) {
|
| - Register receiver = StoreWithVectorDescriptor::ReceiverRegister(); // r1
|
| - Register key = StoreWithVectorDescriptor::NameRegister(); // r2
|
| - Register vector = StoreWithVectorDescriptor::VectorRegister(); // r3
|
| - Register slot = StoreWithVectorDescriptor::SlotRegister(); // r4
|
| - DCHECK(StoreWithVectorDescriptor::ValueRegister().is(r0)); // r0
|
| - Register feedback = r5;
|
| - Register receiver_map = r6;
|
| - Register scratch1 = r9;
|
| -
|
| - __ add(feedback, vector, Operand::PointerOffsetFromSmiKey(slot));
|
| - __ ldr(feedback, FieldMemOperand(feedback, FixedArray::kHeaderSize));
|
| -
|
| - // Try to quickly handle the monomorphic case without knowing for sure
|
| - // if we have a weak cell in feedback. We do know it's safe to look
|
| - // at WeakCell::kValueOffset.
|
| - Label try_array, load_smi_map, compare_map;
|
| - Label not_array, miss;
|
| - HandleMonomorphicCase(masm, receiver, receiver_map, feedback, vector, slot,
|
| - scratch1, &compare_map, &load_smi_map, &try_array);
|
| -
|
| - // Is it a fixed array?
|
| - __ bind(&try_array);
|
| - __ ldr(scratch1, FieldMemOperand(feedback, HeapObject::kMapOffset));
|
| - __ CompareRoot(scratch1, Heap::kFixedArrayMapRootIndex);
|
| - __ b(ne, ¬_array);
|
| -
|
| - // We are using register r8, which is used for the embedded constant pool
|
| - // when FLAG_enable_embedded_constant_pool is true.
|
| - DCHECK(!FLAG_enable_embedded_constant_pool);
|
| - Register scratch2 = r8;
|
| - HandleArrayCases(masm, feedback, receiver_map, scratch1, scratch2, true,
|
| - &miss);
|
| -
|
| - __ bind(¬_array);
|
| - __ CompareRoot(feedback, Heap::kmegamorphic_symbolRootIndex);
|
| - __ b(ne, &miss);
|
| - masm->isolate()->store_stub_cache()->GenerateProbe(
|
| - masm, receiver, key, feedback, receiver_map, scratch1, scratch2);
|
| -
|
| - __ bind(&miss);
|
| - StoreIC::GenerateMiss(masm);
|
| -
|
| - __ bind(&load_smi_map);
|
| - __ LoadRoot(receiver_map, Heap::kHeapNumberMapRootIndex);
|
| - __ jmp(&compare_map);
|
| -}
|
| -
|
| void KeyedStoreICStub::Generate(MacroAssembler* masm) {
|
| GenerateImpl(masm, false);
|
| }
|
|
|