| Index: src/ic/x87/ic-compiler-x87.cc | 
| diff --git a/src/ic/x87/ic-compiler-x87.cc b/src/ic/x87/ic-compiler-x87.cc | 
| index d29e32108b6f70d0e93ebf4c32ba309e2c260e0f..a81158dce8bb216b36f144ba83edd2b67d642dce 100644 | 
| --- a/src/ic/x87/ic-compiler-x87.cc | 
| +++ b/src/ic/x87/ic-compiler-x87.cc | 
| @@ -32,103 +32,6 @@ void PropertyICCompiler::GenerateRuntimeSetProperty( | 
|  | 
|  | 
| #undef __ | 
| -#define __ ACCESS_MASM(masm()) | 
| - | 
| -Handle<Code> PropertyICCompiler::CompilePolymorphic(MapHandleList* maps, | 
| -                                                    CodeHandleList* handlers, | 
| -                                                    Handle<Name> name, | 
| -                                                    Code::StubType type, | 
| -                                                    IcCheckType check) { | 
| -  Label miss; | 
| - | 
| -  if (check == PROPERTY && | 
| -      (kind() == Code::KEYED_STORE_IC || kind() == Code::KEYED_LOAD_IC)) { | 
| -    // In case we are compiling an IC for dictionary loads or stores, just | 
| -    // check whether the name is unique. | 
| -    if (name.is_identical_to(isolate()->factory()->normal_ic_symbol())) { | 
| -      // Keyed loads with dictionaries shouldn't be here, they go generic. | 
| -      // The DCHECK is to protect assumptions when --vector-ics is on. | 
| -      DCHECK(kind() != Code::KEYED_LOAD_IC); | 
| -      Register tmp = scratch1(); | 
| -      __ JumpIfSmi(this->name(), &miss); | 
| -      __ mov(tmp, FieldOperand(this->name(), HeapObject::kMapOffset)); | 
| -      __ movzx_b(tmp, FieldOperand(tmp, Map::kInstanceTypeOffset)); | 
| -      __ JumpIfNotUniqueNameInstanceType(tmp, &miss); | 
| -    } else { | 
| -      __ cmp(this->name(), Immediate(name)); | 
| -      __ j(not_equal, &miss); | 
| -    } | 
| -  } | 
| - | 
| -  Label number_case; | 
| -  Label* smi_target = IncludesNumberMap(maps) ? &number_case : &miss; | 
| -  __ JumpIfSmi(receiver(), smi_target); | 
| - | 
| -  // Polymorphic keyed stores may use the map register | 
| -  Register map_reg = scratch1(); | 
| -  DCHECK(kind() != Code::KEYED_STORE_IC || | 
| -         map_reg.is(StoreTransitionDescriptor::MapRegister())); | 
| -  __ mov(map_reg, FieldOperand(receiver(), HeapObject::kMapOffset)); | 
| -  int receiver_count = maps->length(); | 
| -  int number_of_handled_maps = 0; | 
| -  for (int current = 0; current < receiver_count; ++current) { | 
| -    Handle<Map> map = maps->at(current); | 
| -    if (!map->is_deprecated()) { | 
| -      number_of_handled_maps++; | 
| -      Handle<WeakCell> cell = Map::WeakCellForMap(map); | 
| -      __ CmpWeakValue(map_reg, cell, scratch2()); | 
| -      if (map->instance_type() == HEAP_NUMBER_TYPE) { | 
| -        DCHECK(!number_case.is_unused()); | 
| -        __ bind(&number_case); | 
| -      } | 
| -      __ j(equal, handlers->at(current)); | 
| -    } | 
| -  } | 
| -  DCHECK(number_of_handled_maps != 0); | 
| - | 
| -  __ bind(&miss); | 
| -  TailCallBuiltin(masm(), MissBuiltin(kind())); | 
| - | 
| -  // Return the generated code. | 
| -  InlineCacheState state = | 
| -      number_of_handled_maps > 1 ? POLYMORPHIC : MONOMORPHIC; | 
| -  return GetCode(kind(), type, name, state); | 
| -} | 
| - | 
| - | 
| -Handle<Code> PropertyICCompiler::CompileKeyedStorePolymorphic( | 
| -    MapHandleList* receiver_maps, CodeHandleList* handler_stubs, | 
| -    MapHandleList* transitioned_maps) { | 
| -  Label miss; | 
| -  __ JumpIfSmi(receiver(), &miss, Label::kNear); | 
| -  Register map_reg = scratch1(); | 
| -  __ mov(map_reg, FieldOperand(receiver(), HeapObject::kMapOffset)); | 
| -  for (int i = 0; i < receiver_maps->length(); ++i) { | 
| -    Handle<WeakCell> cell = Map::WeakCellForMap(receiver_maps->at(i)); | 
| -    __ CmpWeakValue(map_reg, cell, scratch2()); | 
| -    if (transitioned_maps->at(i).is_null()) { | 
| -      __ j(equal, handler_stubs->at(i)); | 
| -    } else { | 
| -      Label next_map; | 
| -      __ j(not_equal, &next_map, Label::kNear); | 
| -      Handle<WeakCell> cell = Map::WeakCellForMap(transitioned_maps->at(i)); | 
| -      Register transition_map = scratch1(); | 
| -      DCHECK(!FLAG_vector_stores && | 
| -             transition_map.is(StoreTransitionDescriptor::MapRegister())); | 
| -      __ LoadWeakValue(transition_map, cell, &miss); | 
| -      __ jmp(handler_stubs->at(i), RelocInfo::CODE_TARGET); | 
| -      __ bind(&next_map); | 
| -    } | 
| -  } | 
| -  __ bind(&miss); | 
| -  TailCallBuiltin(masm(), MissBuiltin(kind())); | 
| - | 
| -  // Return the generated code. | 
| -  return GetCode(kind(), Code::NORMAL, factory()->empty_string(), POLYMORPHIC); | 
| -} | 
| - | 
| - | 
| -#undef __ | 
| }  // namespace internal | 
| }  // namespace v8 | 
|  | 
|  |