| Index: src/s390/code-stubs-s390.cc
|
| diff --git a/src/s390/code-stubs-s390.cc b/src/s390/code-stubs-s390.cc
|
| index 6cc9ff27cf878abaa4279d0f588365c58eeb5257..b7e9f9570fff890cee07ba4107bd946e95f90861 100644
|
| --- a/src/s390/code-stubs-s390.cc
|
| +++ b/src/s390/code-stubs-s390.cc
|
| @@ -3138,12 +3138,6 @@ void StubFailureTrampolineStub::Generate(MacroAssembler* masm) {
|
| __ Ret();
|
| }
|
|
|
| -void LoadICTrampolineStub::Generate(MacroAssembler* masm) {
|
| - __ EmitLoadTypeFeedbackVector(LoadWithVectorDescriptor::VectorRegister());
|
| - LoadICStub stub(isolate());
|
| - stub.GenerateForTrampoline(masm);
|
| -}
|
| -
|
| void KeyedLoadICTrampolineStub::Generate(MacroAssembler* masm) {
|
| __ EmitLoadTypeFeedbackVector(LoadWithVectorDescriptor::VectorRegister());
|
| KeyedLoadICStub stub(isolate());
|
| @@ -3156,12 +3150,6 @@ void CallICTrampolineStub::Generate(MacroAssembler* masm) {
|
| __ Jump(stub.GetCode(), RelocInfo::CODE_TARGET);
|
| }
|
|
|
| -void LoadICStub::Generate(MacroAssembler* masm) { GenerateImpl(masm, false); }
|
| -
|
| -void LoadICStub::GenerateForTrampoline(MacroAssembler* masm) {
|
| - GenerateImpl(masm, true);
|
| -}
|
| -
|
| static void HandleArrayCases(MacroAssembler* masm, Register feedback,
|
| Register receiver_map, Register scratch1,
|
| Register scratch2, bool is_polymorphic,
|
| @@ -3252,47 +3240,6 @@ static void HandleMonomorphicCase(MacroAssembler* masm, Register receiver,
|
| __ Jump(ip);
|
| }
|
|
|
| -void LoadICStub::GenerateImpl(MacroAssembler* masm, bool in_frame) {
|
| - Register receiver = LoadWithVectorDescriptor::ReceiverRegister(); // r3
|
| - Register name = LoadWithVectorDescriptor::NameRegister(); // r4
|
| - Register vector = LoadWithVectorDescriptor::VectorRegister(); // r5
|
| - Register slot = LoadWithVectorDescriptor::SlotRegister(); // r2
|
| - Register feedback = r6;
|
| - Register receiver_map = r7;
|
| - Register scratch1 = r8;
|
| -
|
| - __ SmiToPtrArrayOffset(r1, slot);
|
| - __ LoadP(feedback, FieldMemOperand(r1, vector, 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);
|
| - __ LoadP(scratch1, FieldMemOperand(feedback, HeapObject::kMapOffset));
|
| - __ CompareRoot(scratch1, Heap::kFixedArrayMapRootIndex);
|
| - __ bne(¬_array, Label::kNear);
|
| - HandleArrayCases(masm, feedback, receiver_map, scratch1, r9, true, &miss);
|
| -
|
| - __ bind(¬_array);
|
| - __ CompareRoot(feedback, Heap::kmegamorphic_symbolRootIndex);
|
| - __ bne(&miss);
|
| - masm->isolate()->load_stub_cache()->GenerateProbe(
|
| - masm, receiver, name, feedback, receiver_map, scratch1, r9);
|
| -
|
| - __ bind(&miss);
|
| - LoadIC::GenerateMiss(masm);
|
| -
|
| - __ bind(&load_smi_map);
|
| - __ LoadRoot(receiver_map, Heap::kHeapNumberMapRootIndex);
|
| - __ b(&compare_map);
|
| -}
|
| -
|
| void KeyedLoadICStub::Generate(MacroAssembler* masm) {
|
| GenerateImpl(masm, false);
|
| }
|
|
|