| Index: src/ic/arm/ic-compiler-arm.cc
|
| diff --git a/src/ic/arm/ic-compiler-arm.cc b/src/ic/arm/ic-compiler-arm.cc
|
| index 9b8abd3298cd957c47df7ac3bc88fdc36058e30d..7427d16d482257fbaea4a077017aa4d7bbd7de78 100644
|
| --- a/src/ic/arm/ic-compiler-arm.cc
|
| +++ b/src/ic/arm/ic-compiler-arm.cc
|
| @@ -27,108 +27,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_LOAD_IC || kind() == Code::KEYED_STORE_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);
|
| - __ ldr(tmp, FieldMemOperand(this->name(), HeapObject::kMapOffset));
|
| - __ ldrb(tmp, FieldMemOperand(tmp, Map::kInstanceTypeOffset));
|
| - __ JumpIfNotUniqueNameInstanceType(tmp, &miss);
|
| - } else {
|
| - __ cmp(this->name(), Operand(name));
|
| - __ b(ne, &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()));
|
| -
|
| - int receiver_count = maps->length();
|
| - int number_of_handled_maps = 0;
|
| - __ ldr(map_reg, FieldMemOperand(receiver(), HeapObject::kMapOffset));
|
| - 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);
|
| - }
|
| - __ Jump(handlers->at(current), RelocInfo::CODE_TARGET, eq);
|
| - }
|
| - }
|
| - 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);
|
| -
|
| - int receiver_count = receiver_maps->length();
|
| - Register map_reg = scratch1();
|
| - __ ldr(map_reg, FieldMemOperand(receiver(), HeapObject::kMapOffset));
|
| - for (int i = 0; i < receiver_count; ++i) {
|
| - Handle<WeakCell> cell = Map::WeakCellForMap(receiver_maps->at(i));
|
| - __ CmpWeakValue(map_reg, cell, scratch2());
|
| - if (transitioned_maps->at(i).is_null()) {
|
| - __ Jump(handler_stubs->at(i), RelocInfo::CODE_TARGET, eq);
|
| - } else {
|
| - Label next_map;
|
| - __ b(ne, &next_map);
|
| - 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);
|
| - __ Jump(handler_stubs->at(i), RelocInfo::CODE_TARGET, al);
|
| - __ 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
|
|
|
|
|