| Index: src/s390/code-stubs-s390.cc
 | 
| diff --git a/src/s390/code-stubs-s390.cc b/src/s390/code-stubs-s390.cc
 | 
| index 8d85c64059f6bf2a4cfcefdcf7173049d3232105..553d6d8ce4cac546e4447226a8c09fcce6ad843a 100644
 | 
| --- a/src/s390/code-stubs-s390.cc
 | 
| +++ b/src/s390/code-stubs-s390.cc
 | 
| @@ -3139,12 +3139,6 @@ void StubFailureTrampolineStub::Generate(MacroAssembler* masm) {
 | 
|    __ Ret();
 | 
|  }
 | 
|  
 | 
| -void KeyedLoadICTrampolineStub::Generate(MacroAssembler* masm) {
 | 
| -  __ EmitLoadTypeFeedbackVector(LoadWithVectorDescriptor::VectorRegister());
 | 
| -  KeyedLoadICStub stub(isolate());
 | 
| -  stub.GenerateForTrampoline(masm);
 | 
| -}
 | 
| -
 | 
|  void CallICTrampolineStub::Generate(MacroAssembler* masm) {
 | 
|    __ EmitLoadTypeFeedbackVector(r4);
 | 
|    CallICStub stub(isolate(), state());
 | 
| @@ -3241,72 +3235,6 @@ static void HandleMonomorphicCase(MacroAssembler* masm, Register receiver,
 | 
|    __ Jump(ip);
 | 
|  }
 | 
|  
 | 
| -void KeyedLoadICStub::Generate(MacroAssembler* masm) {
 | 
| -  GenerateImpl(masm, false);
 | 
| -}
 | 
| -
 | 
| -void KeyedLoadICStub::GenerateForTrampoline(MacroAssembler* masm) {
 | 
| -  GenerateImpl(masm, true);
 | 
| -}
 | 
| -
 | 
| -void KeyedLoadICStub::GenerateImpl(MacroAssembler* masm, bool in_frame) {
 | 
| -  Register receiver = LoadWithVectorDescriptor::ReceiverRegister();  // r3
 | 
| -  Register key = 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);
 | 
| -
 | 
| -  __ bind(&try_array);
 | 
| -  // Is it a fixed array?
 | 
| -  __ LoadP(scratch1, FieldMemOperand(feedback, HeapObject::kMapOffset));
 | 
| -  __ CompareRoot(scratch1, Heap::kFixedArrayMapRootIndex);
 | 
| -  __ bne(¬_array);
 | 
| -
 | 
| -  // We have a polymorphic element handler.
 | 
| -  Label polymorphic, try_poly_name;
 | 
| -  __ bind(&polymorphic);
 | 
| -  HandleArrayCases(masm, feedback, receiver_map, scratch1, r9, true, &miss);
 | 
| -
 | 
| -  __ bind(¬_array);
 | 
| -  // Is it generic?
 | 
| -  __ CompareRoot(feedback, Heap::kmegamorphic_symbolRootIndex);
 | 
| -  __ bne(&try_poly_name);
 | 
| -  Handle<Code> megamorphic_stub =
 | 
| -      KeyedLoadIC::ChooseMegamorphicStub(masm->isolate(), GetExtraICState());
 | 
| -  __ Jump(megamorphic_stub, RelocInfo::CODE_TARGET);
 | 
| -
 | 
| -  __ bind(&try_poly_name);
 | 
| -  // We might have a name in feedback, and a fixed array in the next slot.
 | 
| -  __ CmpP(key, feedback);
 | 
| -  __ bne(&miss);
 | 
| -  // If the name comparison succeeded, we know we have a fixed array with
 | 
| -  // at least one map/handler pair.
 | 
| -  __ SmiToPtrArrayOffset(r1, slot);
 | 
| -  __ LoadP(feedback,
 | 
| -           FieldMemOperand(r1, vector, FixedArray::kHeaderSize + kPointerSize));
 | 
| -  HandleArrayCases(masm, feedback, receiver_map, scratch1, r9, false, &miss);
 | 
| -
 | 
| -  __ bind(&miss);
 | 
| -  KeyedLoadIC::GenerateMiss(masm);
 | 
| -
 | 
| -  __ bind(&load_smi_map);
 | 
| -  __ LoadRoot(receiver_map, Heap::kHeapNumberMapRootIndex);
 | 
| -  __ b(&compare_map);
 | 
| -}
 | 
| -
 | 
|  void KeyedStoreICTrampolineStub::Generate(MacroAssembler* masm) {
 | 
|    __ EmitLoadTypeFeedbackVector(StoreWithVectorDescriptor::VectorRegister());
 | 
|    KeyedStoreICStub stub(isolate(), state());
 | 
| 
 |