| Index: src/x87/code-stubs-x87.cc
 | 
| diff --git a/src/x87/code-stubs-x87.cc b/src/x87/code-stubs-x87.cc
 | 
| index 13449e76990262620e44d2fb4060d5e474b7097a..0ea919d3b1b0711f2946ff74db1f2e89eca34193 100644
 | 
| --- a/src/x87/code-stubs-x87.cc
 | 
| +++ b/src/x87/code-stubs-x87.cc
 | 
| @@ -2834,117 +2834,6 @@ void StubFailureTrampolineStub::Generate(MacroAssembler* masm) {
 | 
|    __ jmp(ecx);  // Return to IC Miss stub, continuation still on stack.
 | 
|  }
 | 
|  
 | 
| -static void HandleArrayCases(MacroAssembler* masm, Register receiver,
 | 
| -                             Register key, Register vector, Register slot,
 | 
| -                             Register feedback, bool is_polymorphic,
 | 
| -                             Label* miss) {
 | 
| -  // feedback initially contains the feedback array
 | 
| -  Label next, next_loop, prepare_next;
 | 
| -  Label load_smi_map, compare_map;
 | 
| -  Label start_polymorphic;
 | 
| -
 | 
| -  __ push(receiver);
 | 
| -  __ push(vector);
 | 
| -
 | 
| -  Register receiver_map = receiver;
 | 
| -  Register cached_map = vector;
 | 
| -
 | 
| -  // Receiver might not be a heap object.
 | 
| -  __ JumpIfSmi(receiver, &load_smi_map);
 | 
| -  __ mov(receiver_map, FieldOperand(receiver, 0));
 | 
| -  __ bind(&compare_map);
 | 
| -  __ mov(cached_map, FieldOperand(feedback, FixedArray::OffsetOfElementAt(0)));
 | 
| -
 | 
| -  // A named keyed load might have a 2 element array, all other cases can count
 | 
| -  // on an array with at least 2 {map, handler} pairs, so they can go right
 | 
| -  // into polymorphic array handling.
 | 
| -  __ cmp(receiver_map, FieldOperand(cached_map, WeakCell::kValueOffset));
 | 
| -  __ j(not_equal, is_polymorphic ? &start_polymorphic : &next);
 | 
| -
 | 
| -  // found, now call handler.
 | 
| -  Register handler = feedback;
 | 
| -  __ mov(handler, FieldOperand(feedback, FixedArray::OffsetOfElementAt(1)));
 | 
| -  __ pop(vector);
 | 
| -  __ pop(receiver);
 | 
| -  __ lea(handler, FieldOperand(handler, Code::kHeaderSize));
 | 
| -  __ jmp(handler);
 | 
| -
 | 
| -  if (!is_polymorphic) {
 | 
| -    __ bind(&next);
 | 
| -    __ cmp(FieldOperand(feedback, FixedArray::kLengthOffset),
 | 
| -           Immediate(Smi::FromInt(2)));
 | 
| -    __ j(not_equal, &start_polymorphic);
 | 
| -    __ pop(vector);
 | 
| -    __ pop(receiver);
 | 
| -    __ jmp(miss);
 | 
| -  }
 | 
| -
 | 
| -  // Polymorphic, we have to loop from 2 to N
 | 
| -  __ bind(&start_polymorphic);
 | 
| -  __ push(key);
 | 
| -  Register counter = key;
 | 
| -  __ mov(counter, Immediate(Smi::FromInt(2)));
 | 
| -  __ bind(&next_loop);
 | 
| -  __ mov(cached_map, FieldOperand(feedback, counter, times_half_pointer_size,
 | 
| -                                  FixedArray::kHeaderSize));
 | 
| -  __ cmp(receiver_map, FieldOperand(cached_map, WeakCell::kValueOffset));
 | 
| -  __ j(not_equal, &prepare_next);
 | 
| -  __ mov(handler, FieldOperand(feedback, counter, times_half_pointer_size,
 | 
| -                               FixedArray::kHeaderSize + kPointerSize));
 | 
| -  __ pop(key);
 | 
| -  __ pop(vector);
 | 
| -  __ pop(receiver);
 | 
| -  __ lea(handler, FieldOperand(handler, Code::kHeaderSize));
 | 
| -  __ jmp(handler);
 | 
| -
 | 
| -  __ bind(&prepare_next);
 | 
| -  __ add(counter, Immediate(Smi::FromInt(2)));
 | 
| -  __ cmp(counter, FieldOperand(feedback, FixedArray::kLengthOffset));
 | 
| -  __ j(less, &next_loop);
 | 
| -
 | 
| -  // We exhausted our array of map handler pairs.
 | 
| -  __ pop(key);
 | 
| -  __ pop(vector);
 | 
| -  __ pop(receiver);
 | 
| -  __ jmp(miss);
 | 
| -
 | 
| -  __ bind(&load_smi_map);
 | 
| -  __ LoadRoot(receiver_map, Heap::kHeapNumberMapRootIndex);
 | 
| -  __ jmp(&compare_map);
 | 
| -}
 | 
| -
 | 
| -
 | 
| -static void HandleMonomorphicCase(MacroAssembler* masm, Register receiver,
 | 
| -                                  Register key, Register vector, Register slot,
 | 
| -                                  Register weak_cell, Label* miss) {
 | 
| -  // feedback initially contains the feedback array
 | 
| -  Label compare_smi_map;
 | 
| -
 | 
| -  // Move the weak map into the weak_cell register.
 | 
| -  Register ic_map = weak_cell;
 | 
| -  __ mov(ic_map, FieldOperand(weak_cell, WeakCell::kValueOffset));
 | 
| -
 | 
| -  // Receiver might not be a heap object.
 | 
| -  __ JumpIfSmi(receiver, &compare_smi_map);
 | 
| -  __ cmp(ic_map, FieldOperand(receiver, 0));
 | 
| -  __ j(not_equal, miss);
 | 
| -  Register handler = weak_cell;
 | 
| -  __ mov(handler, FieldOperand(vector, slot, times_half_pointer_size,
 | 
| -                               FixedArray::kHeaderSize + kPointerSize));
 | 
| -  __ lea(handler, FieldOperand(handler, Code::kHeaderSize));
 | 
| -  __ jmp(handler);
 | 
| -
 | 
| -  // In microbenchmarks, it made sense to unroll this code so that the call to
 | 
| -  // the handler is duplicated for a HeapObject receiver and a Smi receiver.
 | 
| -  __ bind(&compare_smi_map);
 | 
| -  __ CompareRoot(ic_map, Heap::kHeapNumberMapRootIndex);
 | 
| -  __ j(not_equal, miss);
 | 
| -  __ mov(handler, FieldOperand(vector, slot, times_half_pointer_size,
 | 
| -                               FixedArray::kHeaderSize + kPointerSize));
 | 
| -  __ lea(handler, FieldOperand(handler, Code::kHeaderSize));
 | 
| -  __ jmp(handler);
 | 
| -}
 | 
| -
 | 
|  void KeyedStoreICTrampolineStub::Generate(MacroAssembler* masm) {
 | 
|    __ EmitLoadTypeFeedbackVector(StoreWithVectorDescriptor::VectorRegister());
 | 
|    KeyedStoreICStub stub(isolate(), state());
 | 
| 
 |